[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Feb 24 10:57:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 10:47:47 2014 +0100| [2a3cb1cfcaf45fb548b0cddc7c9e155f43582aec] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a3cb1cfcaf45fb548b0cddc7c9e155f43582aec
---
More information about the ffmpeg-cvslog
mailing list