[FFmpeg-cvslog] Merge commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 14 12:57:14 2013 +0100| [81bcf9454e19702d43e0d314047acbe97226ed89] | committer: Michael Niedermayer

Merge commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6' into release/1.1

* commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6':
  yop: check for input overreads.
  yop: check that extradata is large enough.
  fraps: fix off-by one bug for version 1.

Conflicts:
	libavcodec/fraps.c
	libavcodec/yop.c

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

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