[FFmpeg-cvslog] libdc1394: Unbreak build after c201069fa

Michael Kostylev git at videolan.org
Sat Apr 11 17:59:49 CEST 2015


ffmpeg | branch: master | Michael Kostylev <michael.kostylev at gmail.com> | Sat Apr 11 10:37:49 2015 +0200| [7a9b764c0737f42cf2458c3c5378b0df216e14a2] | committer: Diego Biurrun

libdc1394: Unbreak build after c201069fa

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a9b764c0737f42cf2458c3c5378b0df216e14a2
---

 libavdevice/libdc1394.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 3fa5d1f..20696f5 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -28,16 +28,6 @@
 #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
@@ -51,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



More information about the ffmpeg-cvslog mailing list