ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 19
19:58:17 2014 +0200| [b1cf83b3d4e83b5e7d80ef7262039d1ef0e626e2] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1cf83b3d4e83b5e7d80ef7262039d1ef0e626e2
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
