aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-28 12:29:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-28 12:34:55 +0200
commit506ebdac2a32e3fe27afd2ff40268c851fc1a817 (patch)
tree5ca9861a5459a5f158ce104def62d1f9d2648752 /libavformat/rtmp.h
parent2ac6d6b7cdd48b21f021221fec186d1ab424994a (diff)
parent03b052c023e1f58d879cb7eeb6421ed39262d39d (diff)
downloadffmpeg-506ebdac2a32e3fe27afd2ff40268c851fc1a817.tar.gz
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'
* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d': fate: Invoke standard lavfi tests through fate-run.sh Conflicts: tests/fate/avfilter.mak tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmp.h')
0 files changed, 0 insertions, 0 deletions