RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libdc1394: Unbreak build after c201069fa

This commit is contained in:
Michael Kostylev 2015-04-11 10:37:49 +02:00 committed by Diego Biurrun
parent 4f373a5111
commit 7a9b764c07
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/libdc1394.c
View File

@ -28,16 +28,6 @@
#include <libraw1394/raw1394.h> #include <libraw1394/raw1394.h>
#include <libdc1394/dc1394_control.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_320x240_YUV422 MODE_320x240_YUV422
#define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411 #define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411
#define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422 #define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422
@ -51,6 +41,16 @@
#define DC1394_FRAMERATE_240 FRAMERATE_240 #define DC1394_FRAMERATE_240 FRAMERATE_240
#endif #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 { typedef struct dc1394_data {
AVClass *class; AVClass *class;
#if HAVE_LIBDC1394_1 #if HAVE_LIBDC1394_1