diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 11:41:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:32:26 +0100 |
| commit | 9ebe344166e0050d21a548aa917dfe00c1d3d4b2 (patch) | |
| tree | 8e78c9bd49f179666f580be8ac094b52848ec7e9 /libavcodec/pngenc.c | |
| parent | badb8e15ac00a590f4b85d86b4e0277c72562acd (diff) | |
| download | ffmpeg-9ebe344166e0050d21a548aa917dfe00c1d3d4b2.tar.gz | |
Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
lclenc: use the AVFrame API properly.
Conflicts:
libavcodec/lclenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 85b7b0c519f8d9491b4c0340329a605cc97c8984)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngenc.c')
0 files changed, 0 insertions, 0 deletions