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 /libavcodec/utils.c | |
| parent | 1c5b8b916d3d068aef9b8d0842d9258eb6cb978d (diff) | |
| parent | d2a25c4032ce6ceabb0f51b5c1e6ca865395a793 (diff) | |
Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'
* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
get_buffer(): do not initialize the data.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
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]) |