aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ffm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:58:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:58:17 +0200
commitb1cf83b3d4e83b5e7d80ef7262039d1ef0e626e2 (patch)
tree398aa4126677aef21691a4c86cbffe6af0824abd /libavformat/ffm.h
parent746095bc29817875ac89a7d4771f8a54895b3cbb (diff)
parentb977b287f61fea48ecd6251d54a26334213b7ec6 (diff)
downloadffmpeg-b1cf83b3d4e83b5e7d80ef7262039d1ef0e626e2.tar.gz
Merge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6'
* commit 'b977b287f61fea48ecd6251d54a26334213b7ec6': vsrc_movie: Avoid a variable indirection in movie_get_frame() Conflicts: libavfilter/src_movie.c no change as theres no such code in src_movie.c in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffm.h')
0 files changed, 0 insertions, 0 deletions