On Wed, Feb 1, 2017 at 10:15 AM, Anton Khirnov <an...@khirnov.net> wrote:
> diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
> index b27aa54..771520b 100644
> --- a/libavcodec/h264dec.c
> +++ b/libavcodec/h264dec.c
> @@ -383,14 +383,16 @@ static av_cold int h264_decode_init(AVCodecContext
> *avctx)
> h->avctx->framerate.num *= 2;
> avctx->ticks_per_frame = 2;
>
> - if (avctx->extradata_size > 0 && avctx->extradata) {
> - ret = ff_h264_decode_extradata(avctx->extradata,
> avctx->extradata_size,
> - &h->ps, &h->is_avc,
> &h->nal_length_size,
> - avctx->err_recognition, avctx);
> - if (ret < 0) {
> - h264_decode_end(avctx);
> - return ret;
> - }
> + if (!avctx->internal->is_copy) {
> + if (avctx->extradata_size > 0 && avctx->extradata) {
Probably just a nit, but you could merge the two ifs here, so that you
don't have to reindent the block and minimize code changes. Same for a
few places below.
--
Vittorio
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
