[FFmpeg-cvslog] Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
Michael Niedermayer
git at videolan.org
Mon Dec 9 12:48:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 12:32:37 2013 +0100| [639303867640d1880fad675472bc47e9c95f96c7] | committer: Michael Niedermayer
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=639303867640d1880fad675472bc47e9c95f96c7
---
More information about the ffmpeg-cvslog
mailing list