diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:49:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:49:17 +0200 |
| commit | b602e47f12d72b383d986d66212341af31c9bc82 (patch) | |
| tree | d897ea1a130c3cd040f6f2a495b757c8d1b7337a /libavcodec/vc1.c | |
| parent | 772c801c7db9ef2979356059099661d5159daeea (diff) | |
| parent | 46430fd47c6239ef8742d0a34f9412d5060fa798 (diff) | |
Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'
* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
vc1dec: Don't attempt error concealment on field pictures
vc1dec: fieldtx is only valid for interlaced frame pictures
aacenc: Fix erasure of surround channels
aacenc: Fix target bitrate for twoloop quantiser search
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions