[FFmpeg-cvslog] Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
Michael Niedermayer
git at videolan.org
Fri Dec 6 04:16:53 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 04:09:47 2013 +0100| [0d9f2f5c47a008d3077510e499d68a4e960e2c66] | committer: Michael Niedermayer
Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
mpegvideo: do not set current_picture_ptr in decoders
Conflicts:
libavcodec/mss2.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d9f2f5c47a008d3077510e499d68a4e960e2c66
---
More information about the ffmpeg-cvslog
mailing list