[FFmpeg-cvslog] avcodec/decode: Remove always-true check

Andreas Rheinhardt git at videolan.org
Fri Mar 12 19:38:05 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Mar 12 17:29:28 2021 +0100| [cc448f8d394c4530748f1694bd9d23b6110d1759] | committer: Andreas Rheinhardt

avcodec/decode: Remove always-true check

Forgotten in 1fd76277708cf83572ba243e98f9e848c652f83d.

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc448f8d394c4530748f1694bd9d23b6110d1759
---

 libavcodec/decode.c | 2 --
 1 file changed, 2 deletions(-)

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)



More information about the ffmpeg-cvslog mailing list