Merge commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:57:14 +0000 (12:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:57:14 +0000 (12:57 +0100)
commit81bcf9454e19702d43e0d314047acbe97226ed89
tree92f11a319378bd9157356377ede1b02cac0b3001
parent5a3c8f95d5bfbab31ce4b460d41b193c4a2cfbb5
parent108ca6fad1e0e9af8d6337f908bfd23807b7fbd6
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@gmx.at>
cmdutils.c
libavcodec/fraps.c
libavcodec/yop.c