ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Aug 21
21:23:14 2014 +0200| [24e81a0a8d86e764dfb89cb21e9caa4aff073e1c] | committer:
Michael Niedermayer
Merge commit '11cd727fbd603197cb1e49654fce3352d56f8fd8'
* commit '11cd727fbd603197cb1e49654fce3352d56f8fd8':
vsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6
Conflicts:
libavfilter/src_movie.c
No change, the typo is not part of FFmpeg
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24e81a0a8d86e764dfb89cb21e9caa4aff073e1c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
