[FFmpeg-cvslog] Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
Michael Niedermayer
git at videolan.org
Mon May 19 19:08:39 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 19:02:36 2014 +0200| [af72f62d7b2ab00d6f69c0838f662beb566862d8] | committer: Michael Niedermayer
Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
pthread_frame: simplify the code by using new AVPacket API
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af72f62d7b2ab00d6f69c0838f662beb566862d8
---
More information about the ffmpeg-cvslog
mailing list