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)
commit3138b158dd4bff334263b997664e9c1aeb02127b
tree16fc159fa186ce3866808134d6a3121fcb4f5d5b
parent769eba75eeaa6ee013d7d0573764531e674b6d9b
parent06cf597c352519d2b70f293518c61b8c312f5d4f
Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'

* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
  yop: check that extradata is large enough.

Conflicts:
libavcodec/yop.c

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