[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Apr 3 15:34:00 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 3 15:20:05 2013 +0200| [d3fc2db47e8595e737a1d58689d2bf29c9190c80] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3fc2db47e8595e737a1d58689d2bf29c9190c80
---
More information about the ffmpeg-cvslog
mailing list