diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:03:39 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 22:07:24 +0300 |
| commit | fe25194c5870f21ba10f615f036b64d0c84fca48 (patch) | |
| tree | ec4aa330575d647588e90d2201cc54d5d1b1c174 /libavdevice/libdc1394.c | |
| parent | 71288bf80f37bdc0795396930d8b97c781c94587 (diff) | |
| parent | c201069fac9a76e6604f9d84d76a172434d62200 (diff) | |
Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 77024b312f..5f49c5ed02 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> @@ -48,6 +41,16 @@ #define DC1394_FRAMERATE_240 FRAMERATE_240 #endif +#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" + typedef struct dc1394_data { AVClass *class; #if HAVE_LIBDC1394_1 |