From e5419709f50593769037ab77d7102f82d9260784 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Nov 2013 19:57:14 +0100 Subject: [PATCH] lavc: remove the extended_data workarounds. All decoders should now handle it properly. --- libavcodec/utils.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d21ca0eece..37f4979f6a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1431,10 +1431,6 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi } else ret = 0; - /* many decoders assign whole AVFrames, thus overwriting extended_data; - * make sure it's set correctly */ - picture->extended_data = picture->data; - return ret; } @@ -1444,7 +1440,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, AVPacket *avpkt) { AVCodecInternal *avci = avctx->internal; - int planar, channels; int ret = 0; *got_frame_ptr = 0; @@ -1487,13 +1482,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, av_frame_unref(frame); } - /* many decoders assign whole AVFrames, thus overwriting extended_data; - * make sure it's set correctly; assume decoders that actually use - * extended_data are doing it correctly */ - planar = av_sample_fmt_is_planar(frame->format); - channels = av_get_channel_layout_nb_channels(frame->channel_layout); - if (!(planar && channels > AV_NUM_DATA_POINTERS)) - frame->extended_data = frame->data; return ret; }