[FFmpeg-cvslog] Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
Michael Niedermayer
git at videolan.org
Thu Dec 20 02:42:08 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 20 02:38:02 2012 +0100| [af4b1c02acf6923489d30349c4813a0d73b2f114] | committer: Michael Niedermayer
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af4b1c02acf6923489d30349c4813a0d73b2f114
---
More information about the ffmpeg-cvslog
mailing list