diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:57:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:57:28 +0200 |
| commit | cb22692f05f916ba521a88e198fa8d15f92c9303 (patch) | |
| tree | 979d4ab2a6d360e99c3f0dcfb65c20bd2f7da048 /libavcodec/mpegaudioenc.c | |
| parent | b602e47f12d72b383d986d66212341af31c9bc82 (diff) | |
| parent | fe06795d783785a76c6cbcaa2cd3012e6deb5fa5 (diff) | |
| download | ffmpeg-cb22692f05f916ba521a88e198fa8d15f92c9303.tar.gz | |
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
vc1: implement frame interlaced b-frame header parsing
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
0 files changed, 0 insertions, 0 deletions