diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:02:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:06:34 +0100 |
| commit | 3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba (patch) | |
| tree | 4e167e434117d6f13a92fc7a2a7356108c273816 /libavcodec/loco.c | |
| parent | 85b7b0c519f8d9491b4c0340329a605cc97c8984 (diff) | |
| parent | 45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7 (diff) | |
| download | ffmpeg-3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba.tar.gz | |
Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'
* commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7':
sunrastenc: use the AVFrame API properly.
targaenc: use the AVFrame API properly.
tiffenc: use the AVFrame API properly.
pngenc: use the AVFrame API properly.
Conflicts:
libavcodec/pngenc.c
libavcodec/sunrastenc.c
libavcodec/targaenc.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/loco.c')
0 files changed, 0 insertions, 0 deletions