[FFmpeg-cvslog] Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'
Michael Niedermayer
git at videolan.org
Sun May 18 14:08:21 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:02:31 2014 +0200| [213e82b55c28d28860ec9a7ace8335df860a4c50] | committer: Michael Niedermayer
Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'
* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
yuv4mpegdec: do not set coded_frame properties
Conflicts:
libavformat/yuv4mpegdec.c
See: b45a3e167f497d82effbf8ada453ea47b0ee21da
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=213e82b55c28d28860ec9a7ace8335df860a4c50
---
More information about the ffmpeg-cvslog
mailing list