Skip to content

F
ffmpeg
Commit 7a9b764c authored by Michael Kostylev's avatar Michael Kostylev Committed by Diego Biurrun
Browse files
Options

libdc1394: Unbreak build after c201069f

parent 4f373a51
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
libavdevice/libdc1394.c
View file @ 7a9b764c
...@@ -28,16 +28,6 @@ ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment