diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 22:51:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 22:51:56 +0200 |
| commit | 0a5d22a195b26d83dc823b041054b2a516a6c558 (patch) | |
| tree | a1da4562adc71de71b48edd32ab51ecd99cb59c9 /libavformat/vc1test.c | |
| parent | 46a5003a4a69b0e8cd824fd058618011d44bf8ef (diff) | |
| parent | 8d929afd256069aa881f2bf58ef9f0ffce2d6b7e (diff) | |
| download | ffmpeg-0a5d22a195b26d83dc823b041054b2a516a6c558.tar.gz | |
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
h264_mp4toannexb_bsf: factor out extradata parsing
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vc1test.c')
0 files changed, 0 insertions, 0 deletions