From 7694e9074d0242a0abe4d772cc54e334c80d049b Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 11 Nov 2009 09:28:21 +0000
Subject: Move headers related to setting dvd speed to dvd_common. This makes
 -dvd-speed work again.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29894 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_dvd.c        | 14 --------------
 stream/stream_dvd_common.c | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'stream')

diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 557cdaa4be..46e7100ec1 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -5,25 +5,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
 
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifdef __FreeBSD__
-#include <sys/cdrio.h>
-#endif
-
-#ifdef __linux__
-#include <linux/cdrom.h>
-#include <scsi/sg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#endif
-
 #include <libgen.h>
 #include <errno.h>
 
@@ -39,7 +26,6 @@
 #include "stream_dvd.h"
 #include "stream_dvd_common.h"
 #include "libmpdemux/demuxer.h"
-#include "libavutil/intreadwrite.h"
 
 static char* dvd_device_current;
 int dvd_angle=1;
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index 330ace9b62..9e4da0955d 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -1,7 +1,26 @@
 #include "config.h"
+#include <fcntl.h>
 #include <inttypes.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
 #include <dvdread/ifo_types.h>
+#ifdef __FreeBSD__
+#include <sys/cdrio.h>
+#endif
+
+#ifdef __linux__
+#include <linux/cdrom.h>
+#include <scsi/sg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#endif
+
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "stream_dvd_common.h"
+#include "libavutil/intreadwrite.h"
 
 const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
 const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" };
-- 
cgit v1.2.3