From cad3a5d715a8da2d449b41d3801480fb50d638c2 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 18 Mar 2021 22:45:12 -0300 Subject: [PATCH] avcodec/libxvid: remove unnecessary output packet data check The user buffers passed to avcodec_encode_video2() haven't been propagated to AVCodec.encode2 implementations since 93016f5d1d280f9cb7856883af287fa66affc04c. Also, the generic encode code already unrefs the packet if nothing was encoded. Signed-off-by: James Almer --- libavcodec/libxvid.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 50601807a7..cb9135436a 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -738,7 +738,7 @@ FF_ENABLE_DEPRECATION_WARNINGS static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *picture, int *got_packet) { - int xerr, i, ret, user_packet = !!pkt->data; + int xerr, i, ret; struct xvid_context *x = avctx->priv_data; int mb_width = (avctx->width + 15) / 16; int mb_height = (avctx->height + 15) / 16; @@ -866,8 +866,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } else { - if (!user_packet) - av_packet_unref(pkt); if (!xerr) return 0; av_log(avctx, AV_LOG_ERROR,