diff mbox series

[FFmpeg-devel,1/2] avcodec/decode: Remove always-true check

Message ID 20210312165441.2113452-1-andreas.rheinhardt@gmail.com
State Accepted
Commit cc448f8d394c4530748f1694bd9d23b6110d1759
Headers show
Series [FFmpeg-devel,1/2] avcodec/decode: Remove always-true check | expand

Checks

Context Check Description
andriy/x86_make_warn warning New warnings during build
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt March 12, 2021, 4:54 p.m. UTC 
Forgotten in 1fd76277708cf83572ba243e98f9e848c652f83d.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/decode.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index c7dbf7b791..73cc3def5f 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -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)