Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:09:41 +0000 (14:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:10:56 +0000 (14:10 +0200)
commit4fac4447d153b2a8e88ce7274b851459d7cd93f6
treed1996e13fdfd392ee530b2bea60c029acc0923c9
parent213e82b55c28d28860ec9a7ace8335df860a4c50
parentab3fdaa7131e2fd8e33006daea25a282724c01f0
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@gmx.at>