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

Merge commit 'd2a25c4032'

Browse source 
* commit 'd2a25c4032':
  get_buffer(): do not initialize the data.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-16 13:13:42 +01:00
commit bb29ee62e9
2 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmdutils.c
View file

@ -1853,11 +1853,6 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu
av_log(s, AV_LOG_ERROR, "alloc_buffer: av_image_alloc() failed\n"); av_log(s, AV_LOG_ERROR, "alloc_buffer: av_image_alloc() failed\n");
return ret; return ret;
} }
/* 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:
*/
memset(buf->base[0], 128, ret);
avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) { for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) {

1
libavcodec/utils.c
View file

@ -467,7 +467,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf->base[i] = av_malloc(size[i] + 16); //FIXME 16 buf->base[i] = av_malloc(size[i] + 16); //FIXME 16
if (buf->base[i] == NULL) if (buf->base[i] == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memset(buf->base[i], 128, size[i]);
// no edge if EDGE EMU or not planar YUV // no edge if EDGE EMU or not planar YUV
if ((s->flags & CODEC_FLAG_EMU_EDGE) || !size[2]) if ((s->flags & CODEC_FLAG_EMU_EDGE) || !size[2])