[FFmpeg-cvslog] Merge commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f' into release/2.2
Michael Niedermayer
git at videolan.org
Sat Dec 20 12:58:20 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 12:33:31 2014 +0100| [3cd2c33d36cb5cfe64ca43295f9e592de753f244] | committer: Michael Niedermayer
Merge commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f' into release/2.2
* commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f':
avconv: Use the mpeg12 private option scan_offset
Conflicts:
ffmpeg_opt.c
See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cd2c33d36cb5cfe64ca43295f9e592de753f244
---
More information about the ffmpeg-cvslog
mailing list