diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:36:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:38:41 +0100 |
| commit | 9f890a165666a73376c73b3c2bd920345b5c3b79 (patch) | |
| tree | c458e2bc9350fd0be13b249b63bd319330870e0f /libavcodec/flicvideo.c | |
| parent | 10ac6f3ce9ae4065a5b72ddfaded45f75b357518 (diff) | |
| parent | 2e09096da912f563c4dd889a8f25c314529bbaa6 (diff) | |
| download | ffmpeg-9f890a165666a73376c73b3c2bd920345b5c3b79.tar.gz | |
Merge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'
* commit '2e09096da912f563c4dd889a8f25c314529bbaa6':
kgv1: use the AVFrame API properly.
indeo2: use the AVFrame API properly.
iff: use the AVFrame API properly.
msrle: use the AVFrame API properly.
Conflicts:
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/kgv1dec.c
libavcodec/msrle.c
See: 451b2ca1b4349f9b60416cc057eaf5518d81025c
See: 80e9e63c946660304fc65fa8141ccfdbe4d196d1
See: 057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flicvideo.c')
0 files changed, 0 insertions, 0 deletions