diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 13:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 13:13:42 +0100 |
| commit | bb29ee62e9ef30c26988f386e7c3be7affe836f9 (patch) | |
| tree | b09b40010a8fd2096190cfcf34c7682fc55b63d8 | |
| parent | 1c5b8b916d3d068aef9b8d0842d9258eb6cb978d (diff) | |
| parent | d2a25c4032ce6ceabb0f51b5c1e6ca865395a793 (diff) | |
| download | ffmpeg-bb29ee62e9ef30c26988f386e7c3be7affe836f9.tar.gz | |
Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'
* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
get_buffer(): do not initialize the data.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 5 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/cmdutils.c b/cmdutils.c index bd6ad449f7..7c2117637e 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -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"); 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); for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) { diff --git a/libavcodec/utils.c b/libavcodec/utils.c index dc664d7d86..f55d378a03 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -467,7 +467,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) buf->base[i] = av_malloc(size[i] + 16); //FIXME 16 if (buf->base[i] == NULL) return AVERROR(ENOMEM); - memset(buf->base[i], 128, size[i]); // no edge if EDGE EMU or not planar YUV if ((s->flags & CODEC_FLAG_EMU_EDGE) || !size[2]) |