Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:21:39 +0000 (15:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:21:39 +0000 (15:21 +0100)
commita845ac78c9428d6fd0f9f4f61a34ac816e3dedfa
tree071d4b4757b5b9abcfe05857f7e9c50aee88b43a
parentddc3ca2caa4a78f0e6824d0d19bc98cfd955b333
parent2cd4068071b9a8908823a3107f97e938211045ce
Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

* commit '2cd4068071b9a8908823a3107f97e938211045ce':
  fraps: fix off-by one bug for version 1.

Conflicts:
libavcodec/fraps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
libavcodec/fraps.c