Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavdevice/alldevices.c

@@ -21,13 +21,23 @@
 #include "config.h"
 #include "avdevice.h"
 
-#define REGISTER_OUTDEV(X,x) { \
+#define REGISTER_OUTDEV(X, x)                                           \
+    {                                                                   \
         extern AVOutputFormat ff_##x##_muxer;                           \
-          if(CONFIG_##X##_OUTDEV)  av_register_output_format(&ff_##x##_muxer); }
-#define REGISTER_INDEV(X,x) { \
+        if (CONFIG_##X##_OUTDEV)                                        \
+            av_register_output_format(&ff_##x##_muxer);                 \
+    }
+
+#define REGISTER_INDEV(X, x)                                            \
+    {                                                                   \
         extern AVInputFormat ff_##x##_demuxer;                          \
-          if(CONFIG_##X##_INDEV)   av_register_input_format(&ff_##x##_demuxer); }
-#define REGISTER_INOUTDEV(X,x)  REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)
+        if (CONFIG_##X##_INDEV)                                         \
+            av_register_input_format(&ff_##x##_demuxer);                \
+    }
+
+#define REGISTER_INOUTDEV(X, x)                                         \
+    REGISTER_OUTDEV(X, x);                                              \
+    REGISTER_INDEV(X, x)
 
 void avdevice_register_all(void)
 {
@@ -38,7 +48,7 @@ void avdevice_register_all(void)
     initialized = 1;
 
     /* devices */
-    REGISTER_INOUTDEV (ALSA, alsa);
+    REGISTER_INOUTDEV(ALSA,             alsa);
     REGISTER_INDEV   (BKTR,             bktr);
     REGISTER_OUTDEV  (CACA,             caca);
     REGISTER_INDEV   (DSHOW,            dshow);
@@ -48,10 +58,10 @@ void avdevice_register_all(void)
     REGISTER_INDEV   (JACK,             jack);
     REGISTER_INDEV   (LAVFI,            lavfi);
     REGISTER_INDEV   (OPENAL,           openal);
-    REGISTER_INOUTDEV (OSS, oss);
+    REGISTER_INOUTDEV(OSS,              oss);
     REGISTER_INDEV   (PULSE,            pulse);
     REGISTER_OUTDEV  (SDL,              sdl);
-    REGISTER_INOUTDEV (SNDIO, sndio);
+    REGISTER_INOUTDEV(SNDIO,            sndio);
     REGISTER_INDEV   (V4L2,             v4l2);
 //    REGISTER_INDEV   (V4L,              v4l
     REGISTER_INDEV   (VFWCAP,           vfwcap);