[FFmpeg-cvslog] Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
Michael Niedermayer
git at videolan.org
Sun Nov 17 01:28:11 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 01:16:26 2013 +0100| [ddfdcd2b5ecce0914c1eefa6269060bdbc879b17] | committer: Michael Niedermayer
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
jvdec: use the AVFrame API properly.
Conflicts:
libavcodec/jvdec.c
See: 678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddfdcd2b5ecce0914c1eefa6269060bdbc879b17
---
More information about the ffmpeg-cvslog
mailing list