X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Futils.c;h=fdbdfd54a205641dc6fb963d3994af05fbcc49eb;hp=bfd470b24e93abc769e40e553185680ae7efbed2;hb=fa0319b4fdb569f9f7a5a5ea94fc5245fb252af8;hpb=b461cd4deb8e8d9698797429b4fe85bfb9208fe6;ds=sidebyside diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bfd470b24e..fdbdfd54a2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -885,8 +885,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, } } - ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); - if (!ret && *got_packet_ptr) { + ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); + if (!ret) { + if (*got_packet_ptr) { if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) { if (avpkt->pts == AV_NOPTS_VALUE) avpkt->pts = frame->pts; @@ -899,7 +900,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, avpkt->size = 0; } - if (!ret) { if (!user_packet && avpkt->size) { uint8_t *new_data = av_realloc(avpkt->data, avpkt->size); if (new_data)