diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:17:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:32:19 +0100 |
| commit | badb8e15ac00a590f4b85d86b4e0277c72562acd (patch) | |
| tree | a809a4799bc0209353fe75a680a8b563bc8a16fe /libavcodec/pngenc.c | |
| parent | 48c192c48c3cf563bb763cdcd4b880cf7645557d (diff) | |
| download | ffmpeg-badb8e15ac00a590f4b85d86b4e0277c72562acd.tar.gz | |
Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'
* commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462':
eamad: use the AVFrame API properly.
dpxenc: use the AVFrame API properly.
bmpenc: use the AVFrame API properly.
sgienc: use the AVFrame API properly.
Conflicts:
libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ad477d9098b5281cede0bd8525ca90b0e52436d)
Conflicts:
libavcodec/eamad.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'libavcodec/pngenc.c')
0 files changed, 0 insertions, 0 deletions