diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-01 13:22:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-01 13:22:21 +0100 |
| commit | 9bacb576bcdfc86473c04dba8296426fe185ad07 (patch) | |
| tree | 2ae86e37e63b46fa181d4ef87549521b957326f5 /libavcodec/mjpega_dump_header_bsf.c | |
| parent | 021c0c5f5246351a290c701e7b5c98458ede1b54 (diff) | |
| parent | f726fc21ef76a8ba3445448066f7b2a687fbca16 (diff) | |
| download | ffmpeg-9bacb576bcdfc86473c04dba8296426fe185ad07.tar.gz | |
Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16'
* commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16':
ogg: Provide an option to offset the serial number
Conflicts:
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpega_dump_header_bsf.c')
0 files changed, 0 insertions, 0 deletions