[FFmpeg-devel] [PATCH 2.6/3] libavformat/protocols.c: avio_enum_protocols(): Move assignment to '*opaque'

Michael Witten mfwitten at gmail.com
Wed Aug 11 22:00:08 EEST 2021


The assignment is not necessary until returning.
---
 libavformat/protocols.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/protocols.c b/libavformat/protocols.c
index bedaa9ef77..ec7c72b14f 100644
--- a/libavformat/protocols.c
+++ b/libavformat/protocols.c
@@ -96,12 +96,12 @@ const char *avio_enum_protocols(void **const opaque, const int output)
     typedef const URLProtocol *const *Iterator;
     Iterator p = *opaque ? (Iterator)(*opaque) + 1 : url_protocols;
 iterate:
-    *opaque = (void *)p;
     if (!*p) {
         *opaque = NULL;
         return NULL;
     }
     if ((output && (*p)->url_write) || (!output && (*p)->url_read)) {
+        *opaque = (void *)p;
         return (*p)->name;
     }
     ++p;
-- 
2.22.0



More information about the ffmpeg-devel mailing list