generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge commit '187d719760bd130f848194ec4a6bd476341914bb'"

Browse Source 
This reverts commit c67aa7f287, reversing
changes made to 46bd0e8e0d.

The merge should have been a noop as the support was added in
601c238854
This commit is contained in:
Clément Bœsch 2016-07-09 15:54:59 +02:00
parent c67aa7f287
commit 3cdd5f4b7c
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/h264.c
View File

@ -1235,8 +1235,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
H264Picture *out; H264Picture *out;
int i, out_idx; int i, out_idx;
int ret; int ret;
const uint8_t *new_extradata;
int new_extradata_size;
h->flags = avctx->flags; h->flags = avctx->flags;
h->setup_finished = 0; h->setup_finished = 0;
@ -1304,17 +1302,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
avctx->err_recognition, avctx); avctx->err_recognition, avctx);
} }
new_extradata_size = 0;
new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,
&new_extradata_size);
if (new_extradata_size > 0 && new_extradata) {
ret = ff_h264_decode_extradata(new_extradata, new_extradata_size,
&h->ps, &h->is_avc, &h->nal_length_size,
avctx->err_recognition, avctx);
if (ret < 0)
return ret;
}
buf_index = decode_nal_units(h, buf, buf_size); buf_index = decode_nal_units(h, buf, buf_size);
if (buf_index < 0) if (buf_index < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;