diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-17 01:16:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-17 01:17:18 +0100 |
| commit | ddfdcd2b5ecce0914c1eefa6269060bdbc879b17 (patch) | |
| tree | edeba220904a89bd8249555f6ec880ad382768a1 /libavcodec/zerocodec.c | |
| parent | 5219afc09d8e97e18917738cbc052f903df9a619 (diff) | |
| parent | b7462a3904d71ff799584faf5b875cad59ca2f31 (diff) | |
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
jvdec: use the AVFrame API properly.
Conflicts:
libavcodec/jvdec.c
See: 678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/zerocodec.c')
0 files changed, 0 insertions, 0 deletions