[FFmpeg-cvslog] Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
Michael Niedermayer
git at videolan.org
Mon Dec 9 13:02:50 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 12:54:59 2013 +0100| [37945584bfb29f187e38531c90bb02a32014e48d] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37945584bfb29f187e38531c90bb02a32014e48d
---
More information about the ffmpeg-cvslog
mailing list