[FFmpeg-cvslog] Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
Michael Niedermayer
git at videolan.org
Wed Jun 11 22:38:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 11 22:29:40 2014 +0200| [67911cc57bbe2958fe62ca092b0e43438cd0ba52] | committer: Michael Niedermayer
Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
mpegvideo: synchronize AVFrame pointers in ERContext fully
Conflicts:
libavcodec/mpegvideo.c
See: 8ef9dcf1d74aea55bf39f1e479fe67e98d973954
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67911cc57bbe2958fe62ca092b0e43438cd0ba52
---
More information about the ffmpeg-cvslog
mailing list