|
|
|
@ -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; |
|
|
|
|
} |
|
|
|
|