[FFmpeg-cvslog] Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 16:05:06 2013 +0100| [3138b158dd4bff334263b997664e9c1aeb02127b] | committer: Michael Niedermayer

Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'

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

Conflicts:
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3138b158dd4bff334263b997664e9c1aeb02127b
---