Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:05:06 +0000 (16:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:05:06 +0000 (16:05 +0100)
* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
  yop: check that extradata is large enough.

Conflicts:
libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/yop.c

Simple merge