diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-04-08 17:27:42 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-04-09 16:40:12 +0200 |
| commit | c201069fac9a76e6604f9d84d76a172434d62200 (patch) | |
| tree | a01d35dac44bbe040ab0f12639e90ae0af7024d4 /libavdevice/libdc1394.c | |
| parent | 27852f2f1dec3749ea79883b70484c841169f747 (diff) | |
| download | ffmpeg-c201069fac9a76e6604f9d84d76a172434d62200.tar.gz | |
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Also reshuffle headers into canonical order where appropriate.
Diffstat (limited to 'libavdevice/libdc1394.c')
| -rw-r--r-- | libavdevice/libdc1394.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index cc348d4e84..3fa5d1fbad 100644 --- a/libavdevice/libdc1394.c +++ b/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 |