mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-11 20:05:06 +02:00
Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'
* commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0':
yop: only set extradata size after it has been successfully allocated
Conflicts:
libavformat/yop.c
See: a807c68253
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4fac4447d1