diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:33:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:33:51 +0100 |
| commit | 3cd2c33d36cb5cfe64ca43295f9e592de753f244 (patch) | |
| tree | 490ba2c5143e361723383d679985329256eeaa9a /doc/examples/demuxing_decoding.c | |
| parent | c494be64119f46329c8ba8a31ae8afa22a07f6d5 (diff) | |
| parent | e7fdd6aa0d11c3e144988d7090f972224799e07f (diff) | |
| download | ffmpeg-3cd2c33d36cb5cfe64ca43295f9e592de753f244.tar.gz | |
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@gmx.at>
Diffstat (limited to 'doc/examples/demuxing_decoding.c')
0 files changed, 0 insertions, 0 deletions