[FFmpeg-cvslog] lavfi/framequeue: remove redundant logic code

杨亚磊 via ffmpeg-devel git at videolan.org
Thu Sep 28 10:38:17 EEST 2023


ffmpeg | branch: master | 杨亚磊 via ffmpeg-devel <ffmpeg-devel at ffmpeg.org> | Thu Sep 14 13:22:13 2023 +0000| [ee8d2ece7b408d0c82908f65b5c38c6c1e5d2def] | committer: Nicolas George

lavfi/framequeue: remove redundant logic code

In this logical branch, fq->queued and fq->allocated must be equal.
Deleting this code will make it easier to understand the logic
(copy the data before tail to the newly requested space)

Signed-off-by: yangyalei <yangyalei at xiaomi.com>

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

 libavfilter/framequeue.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavfilter/framequeue.c b/libavfilter/framequeue.c
index 383c195b85..ace0dad689 100644
--- a/libavfilter/framequeue.c
+++ b/libavfilter/framequeue.c
@@ -79,9 +79,8 @@ int ff_framequeue_add(FFFrameQueue *fq, AVFrame *frame)
             FFFrameBucket *nq = av_realloc_array(fq->queue, na, sizeof(*nq));
             if (!nq)
                 return AVERROR(ENOMEM);
-            if (fq->tail + fq->queued > fq->allocated)
-                memmove(nq + fq->allocated, nq,
-                        (fq->tail + fq->queued - fq->allocated) * sizeof(*nq));
+            if (fq->tail)
+                memmove(nq + fq->allocated, nq, fq->tail * sizeof(*nq));
             fq->queue = nq;
             fq->allocated = na;
         }



More information about the ffmpeg-cvslog mailing list