]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/decode: Remove always-true check
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fri, 12 Mar 2021 16:29:28 +0000 (17:29 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fri, 12 Mar 2021 17:28:20 +0000 (18:28 +0100)
Forgotten in 1fd76277708cf83572ba243e98f9e848c652f83d.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavcodec/decode.c

index c7dbf7b791014e294a595f01c047d84764c48cca..73cc3def5f16c42f72a96e89404e63244539cb8e 100644 (file)
@@ -1744,7 +1744,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
         av_fifo_generic_read(avctx->internal->pkt_props,
                              pkt, sizeof(*pkt), NULL);
 
-    if (pkt) {
         frame->pts = pkt->pts;
 #if FF_API_PKT_PTS
 FF_DISABLE_DEPRECATION_WARNINGS
@@ -1775,7 +1774,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
         } else {
             frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
         }
-    }
     frame->reordered_opaque = avctx->reordered_opaque;
 
     if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)