diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:21:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:21:39 +0100 |
| commit | a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa (patch) | |
| tree | 071d4b4757b5b9abcfe05857f7e9c50aee88b43a /tests/ref | |
| parent | ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (diff) | |
| parent | 2cd4068071b9a8908823a3107f97e938211045ce (diff) | |
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>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/fate/fraps-v1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/fraps-v1 b/tests/ref/fate/fraps-v1 index 64392c33b4..29c7e37df3 100644 --- a/tests/ref/fate/fraps-v1 +++ b/tests/ref/fate/fraps-v1 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 230400, 0x6bc891ff +0, 0, 0, 1, 230400, 0x23c29d17 |