diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:54:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:54:59 +0100 |
| commit | 37945584bfb29f187e38531c90bb02a32014e48d (patch) | |
| tree | ae79af85bc44ef636313252c7f43f967488b459c /COPYING.LGPLv3 | |
| parent | 639303867640d1880fad675472bc47e9c95f96c7 (diff) | |
| parent | afa21a12bf084f905187615706b0a8d92bc98661 (diff) | |
| download | ffmpeg-37945584bfb29f187e38531c90bb02a32014e48d.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>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions