[FFmpeg-cvslog] Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
Michael Niedermayer
git at videolan.org
Fri Apr 12 15:52:24 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 15:33:37 2013 +0200| [f81a8e89a1c2819bc0b39153023188f955d3c52c] | committer: Michael Niedermayer
Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
avconv: print filter options in -h full output.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f81a8e89a1c2819bc0b39153023188f955d3c52c
---
More information about the ffmpeg-cvslog
mailing list