lavd: fix iterating of input and output devices
authorFelix Matouschek <felix@matouschek.org>
Wed, 14 Mar 2018 12:14:07 +0000 (13:14 +0100)
committerTimo Rothenpieler <timo@rothenpieler.org>
Sun, 18 Mar 2018 16:45:20 +0000 (17:45 +0100)
In the previous implementation the first input or output device
was skipped when device_next was called with prev = NULL

Signed-off-by: Felix Matouschek <felix@matouschek.org>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
libavdevice/alldevices.c

index 4c89649..3999335 100644 (file)
@@ -126,16 +126,13 @@ static void *device_next(void *prev, int output,
 
     ff_thread_once(&av_device_next_init, av_device_init_next);
 
-    if (!prev && !(prev = (output ? (void*)outdev_list[0] : (void*)indev_list[0])))
-        return NULL;
-
     do {
         if (output) {
-            if (!(prev = ((AVOutputFormat *)prev)->next))
+            if (!(prev = prev ? ((AVOutputFormat *)prev)->next : (void*)outdev_list[0]))
                 break;
             pc = ((AVOutputFormat *)prev)->priv_class;
         } else {
-            if (!(prev = ((AVInputFormat *)prev)->next))
+            if (!(prev = prev ? ((AVInputFormat *)prev)->next : (void*)indev_list[0]))
                 break;
             pc = ((AVInputFormat *)prev)->priv_class;
         }