avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Also reshuffle headers into canonical order where appropriate.

libavdevice/alsa-audio-dec.c

@@ -46,9 +46,12 @@
  */
 
 #include <alsa/asoundlib.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
-#include "libavutil/opt.h"
 
 #include "alsa-audio.h"
 

libavdevice/alsa-audio-enc.c

@@ -38,6 +38,9 @@
  */
 
 #include <alsa/asoundlib.h>
+
+#include "libavutil/internal.h"
+
 #include "libavformat/avformat.h"
 
 #include "alsa-audio.h"

libavdevice/jack_audio.c

@@ -24,6 +24,7 @@
 #include <semaphore.h>
 #include <jack/jack.h>
 
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/fifo.h"
 #include "libavutil/opt.h"

libavdevice/libdc1394.c

@@ -21,13 +21,6 @@
  */
 
 #include "config.h"
-#include "libavformat/avformat.h"
-#include "libavformat/internal.h"
-#include "libavutil/log.h"
-#include "libavutil/mathematics.h"
-#include "libavutil/opt.h"
-#include "libavutil/parseutils.h"
-#include "libavutil/pixdesc.h"
 
 #if HAVE_LIBDC1394_2
 #include <dc1394/dc1394.h>
@@ -35,6 +28,16 @@
 #include <libraw1394/raw1394.h>
 #include <libdc1394/dc1394_control.h>
 
+#include "libavutil/internal.h"
+#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 #define DC1394_VIDEO_MODE_320x240_YUV422 MODE_320x240_YUV422
 #define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411
 #define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422

libavdevice/pulse.c

@@ -29,10 +29,12 @@
 #include <pulse/rtclock.h>
 #include <pulse/error.h>
 
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+#include "libavutil/time.h"
+
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
-#include "libavutil/time.h"
-#include "libavutil/opt.h"
 
 #define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
 

libavdevice/sndio_dec.c

@@ -22,11 +22,13 @@
 #include <stdint.h>
 #include <sndio.h>
 
-#include "libavformat/avformat.h"
+#include "libavutil/internal.h"
-#include "libavformat/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
 
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 #include "sndio_common.h"
 
 static av_cold int audio_read_header(AVFormatContext *s1)

libavdevice/sndio_enc.c

@@ -22,6 +22,8 @@
 #include <stdint.h>
 #include <sndio.h>
 
+#include "libavutil/internal.h"
+
 #include "libavformat/avformat.h"
 
 #include "sndio_common.h"

libavdevice/vfwcap.c

@@ -19,13 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavformat/avformat.h"
+#include <vfw.h>
-#include "libavformat/internal.h"
+#include <windows.h>
+
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
-#include <windows.h>
+
-#include <vfw.h>
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
 
 /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
 #ifndef HWND_MESSAGE

libavdevice/x11grab.c

@@ -51,6 +51,7 @@
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XShm.h>
 
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"

libavdevice/xcbgrab.c

@@ -33,14 +33,15 @@
 #include <xcb/shm.h>
 #endif
 
-#include "libavformat/avformat.h"
+#include "libavutil/internal.h"
-#include "libavformat/internal.h"
-
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/time.h"
 
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 typedef struct XCBGrabContext {
     const AVClass *class;