From 596f66cccf0e8959dc1fc04435358622272c0433 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 3 Apr 2018 18:06:23 +0200
Subject: av_common: cosmetic simplification to ffmpeg component iteration
 loops

---
 common/av_common.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'common')

diff --git a/common/av_common.c b/common/av_common.c
index 00c7d79a74..2c959ffe4f 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -222,10 +222,9 @@ void mp_set_avcodec_threads(struct mp_log *l, AVCodecContext *avctx, int threads
 static void add_codecs(struct mp_decoder_list *list, enum AVMediaType type,
                        bool decoders)
 {
-    const AVCodec *cur = NULL;
     void *iter = NULL;
     for (;;) {
-        cur = av_codec_iterate(&iter);
+        const AVCodec *cur = av_codec_iterate(&iter);
         if (!cur)
             break;
         if (av_codec_is_decoder(cur) == decoders &&
@@ -251,11 +250,10 @@ void mp_add_lavc_encoders(struct mp_decoder_list *list)
 char **mp_get_lavf_demuxers(void)
 {
     char **list = NULL;
-    const AVInputFormat *cur = NULL;
     void *iter = NULL;
     int num = 0;
     for (;;) {
-        cur = av_demuxer_iterate(&iter);
+        const AVInputFormat *cur = av_demuxer_iterate(&iter);
         if (!cur)
             break;
         MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(NULL, cur->name));
-- 
cgit v1.2.3