diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:54:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 21:28:40 +0100 |
| commit | 09965ae7d810e67af17b992a84a90ba4d2787b10 (patch) | |
| tree | feee4992042417b2365d7d69241ccef86dde5bba /CREDITS | |
| parent | f448478a311f2650e0bc48c79c67f2114d898919 (diff) | |
| download | ffmpeg-09965ae7d810e67af17b992a84a90ba4d2787b10.tar.gz | |
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
p*menc: use the AVFrame API properly.
Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 37945584bfb29f187e38531c90bb02a32014e48d)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions