[FFmpeg-cvslog] Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 14:13:52 2013 +0200| [9bb86faca7936f6dba93aa3b11fc24f19c7878a4] | committer: Michael Niedermayer

Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'

* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
  fraps: Make the input buffer size checks more strict

Conflicts:
	libavcodec/fraps.c

The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.

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

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