[FFmpeg-cvslog] Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'
Michael Niedermayer
git at videolan.org
Thu Jun 13 12:16:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 12:10:05 2013 +0200| [294af5140132521f11723467c7230e7285702545] | committer: Michael Niedermayer
Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'
* commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4':
4xm: fold last_picture lazy allocation in decode_p_frame
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=294af5140132521f11723467c7230e7285702545
---
More information about the ffmpeg-cvslog
mailing list