[FFmpeg-cvslog] Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'
Michael Niedermayer
git at videolan.org
Sun May 18 14:11:31 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:09:41 2014 +0200| [4fac4447d153b2a8e88ce7274b851459d7cd93f6] | committer: Michael Niedermayer
Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'
* commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0':
yop: only set extradata size after it has been successfully allocated
Conflicts:
libavformat/yop.c
See: a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fac4447d153b2a8e88ce7274b851459d7cd93f6
---
More information about the ffmpeg-cvslog
mailing list