Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:13:52 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:21:34 +0000 (14:21 +0200)
commit9bb86faca7936f6dba93aa3b11fc24f19c7878a4
tree2c0eebe5760e9d56064d6a8030da052885af2523
parentc188c10805aa62d0cdeb5b5ecfba5fa4aec9c47d
parent3185a80259ce1f8f8111073dbd14a69a396e03a3
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@gmx.at>
libavcodec/fraps.c