FFmpeg/libavcodec
Michael Niedermayer a845ac78c9 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>
2013-02-06 15:21:39 +01:00
..
2013-02-06 10:21:52 +01:00
2013-01-23 11:21:09 +00:00
2013-01-26 04:27:53 +01:00
2013-02-06 12:35:33 +00:00
2013-01-23 11:21:09 +00:00
2013-01-22 18:32:56 -08:00
2013-02-05 00:37:20 +01:00
2013-02-05 00:37:20 +01:00
2013-01-23 11:21:09 +00:00
2013-01-25 12:54:15 +00:00
2013-01-31 04:21:26 +01:00
2013-01-29 19:11:28 +01:00
2013-01-29 11:01:19 +11:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00
2013-01-31 00:02:17 +01:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-01-24 01:47:20 +01:00
2013-02-03 13:08:36 +01:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00
2013-01-29 22:36:18 +01:00
2013-01-28 22:47:30 +00:00
2013-01-23 05:25:04 +01:00
2013-01-30 23:12:57 +01:00
2013-01-24 14:15:55 +01:00