Module: libav Branch: master Commit: 187d719760bd130f848194ec4a6bd476341914bb
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Thu Jun 9 18:55:17 2016 -0400 h264: Support AV_PKT_DATA_NEW_EXTRADATA --- libavcodec/h264.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 224ba2f..2dba261 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1004,6 +1004,8 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data, AVFrame *pict = data; int buf_index = 0; int ret; + const uint8_t *new_extradata; + int new_extradata_size; h->flags = avctx->flags; h->setup_finished = 0; @@ -1042,6 +1044,17 @@ out: return buf_index; } + 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); if (buf_index < 0) return AVERROR_INVALIDDATA; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
