[FFmpeg-cvslog] Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
Michael Niedermayer
git at videolan.org
Mon Dec 9 13:31:15 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 13:19:50 2013 +0100| [45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874] | committer: Michael Niedermayer
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
pthread_frame: use the AVFrame API properly.
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874
---
More information about the ffmpeg-cvslog
mailing list