eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'da7baaaae7'

Browse source 
* commit 'da7baaaae7':
  aasc: fix output for msrle compression.
  msrledec: check bounds before constructing a possibly invalid pointer,
  cmdutils: remove ansi from the list of broken codecs.

Conflicts:
	tests/ref/fate/aasc

Also See: e7117f1c10

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-06 15:11:14 +01:00
commit ddc3ca2caa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmdutils.c
View file

@ -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:
* ansi, aasc, fraps-v1, qtrle-1bit
* fraps-v1, qtrle-1bit
*/
memset(buf->base[0], 128, ret);