RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 13:27:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '187d719760bd130f848194ec4a6bd476341914bb'

Browse Source 
* commit '187d719760bd130f848194ec4a6bd476341914bb':
  h264: Support AV_PKT_DATA_NEW_EXTRADATA

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2016-07-09 15:03:27 +02:00
commit c67aa7f287
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/h264.c
View File

@ -1235,6 +1235,8 @@ 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;
@ -1302,6 +1304,17 @@ 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;