diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:23:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:23:40 +0200 |
| commit | c453da33a3dee16724a734d08c0c7ba71c361b67 (patch) | |
| tree | 707e4468181d6de20a5657697ecea040ea40f405 /libavcodec/aic.c | |
| parent | 28e6b7b9b4e0a6ec05575cffedd56e1319f8691f (diff) | |
| parent | 1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f (diff) | |
Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'
* commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f':
vc1dec: Add support for interlaced B-frames
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aic.c')
0 files changed, 0 insertions, 0 deletions