[FFmpeg-cvslog] Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 15:21:39 2013 +0100| [a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa] | committer: Michael Niedermayer

Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

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

Conflicts:
	libavcodec/fraps.c

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

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