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 /cmdutils.c | |
| parent | ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (diff) | |
| parent | 2cd4068071b9a8908823a3107f97e938211045ce (diff) | |
| download | ffmpeg-a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa.tar.gz | |
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 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 1357882055..29a23d7e4f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1856,7 +1856,7 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu /* XXX this shouldn't be needed, but some tests break without this line * those decoders are buggy and need to be fixed. * the following tests fail: - * fraps-v1, qtrle-1bit + * qtrle-1bit */ memset(buf->base[0], 128, ret); |