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)
* 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>

Trivial merge