lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

14 years ago · 6b899e16de
parent e48993e3cf
commit 6b899e16de
20 changed files with 19 additions and 21 deletions
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@ -19,7 +19,6 @@
 */

 #include "config.h"
-#include "libavformat/avformat.h"
 #include "avdevice.h"

 #define REGISTER_OUTDEV(X,x) { \
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@ -29,7 +29,7 @@
 */

 #include <alsa/asoundlib.h>
-#include "libavformat/avformat.h"
+#include "avdevice.h"

 #include "alsa-audio.h"

--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@ -46,9 +46,9 @@
 */

 #include <alsa/asoundlib.h>
-#include "libavformat/avformat.h"
 #include "libavutil/opt.h"

+#include "avdevice.h"
 #include "alsa-audio.h"

 static av_cold int audio_read_header(AVFormatContext *s1,
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa-audio-enc.c
@ -38,8 +38,8 @@
 */

 #include <alsa/asoundlib.h>
-#include "libavformat/avformat.h"

+#include "avdevice.h"
 #include "alsa-audio.h"

 static av_cold int audio_write_header(AVFormatContext *s1)
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa-audio.h
@ -32,8 +32,8 @@

 #include <alsa/asoundlib.h>
 #include "config.h"
-#include "libavformat/avformat.h"
 #include "libavutil/log.h"
+#include "avdevice.h"

 /* XXX: we make the assumption that the soundcard accepts this format */
 /* XXX: find better solution with "preinit" method, needed also in
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@ -24,7 +24,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include "libavformat/avformat.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
@ -47,6 +46,7 @@
 #include <signal.h>
 #include <stdint.h>
 #include <strings.h>
+#include "avdevice.h"

 typedef struct {
    AVClass *class;
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@ -19,9 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include "libavformat/avformat.h"
 #include "libavformat/timefilter.h"

+#include "avdevice.h"
 #include "dshow.h"

 struct dshow_ctx {
--- a/libavdevice/dshow.h
+++ b/libavdevice/dshow.h
@ -21,7 +21,7 @@

 #define DSHOWDEBUG 0

-#include "libavformat/avformat.h"
+#include "avdevice.h"

 #define COBJMACROS
 #include <windows.h>
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@ -32,7 +32,7 @@

 #include "libavutil/log.h"
 #include "libavutil/opt.h"
-#include "libavformat/avformat.h"
+#include "avdevice.h"

 #undef DV1394_DEBUG

--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@ -39,7 +39,7 @@

 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
-#include "libavformat/avformat.h"
+#include "avdevice.h"

 struct rgb_pixfmt_map_entry {
    int bits_per_pixel;
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@ -27,8 +27,8 @@
 #include "libavutil/log.h"
 #include "libavutil/fifo.h"
 #include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
 #include "libavformat/timefilter.h"
+#include "avdevice.h"

 /**
 * Size of the internal FIFO buffers as a number of audio packets
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@ -21,9 +21,9 @@
 */

 #include "config.h"
-#include "libavformat/avformat.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "avdevice.h"

 #if HAVE_LIBDC1394_2
 #include <dc1394/dc1394.h>
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@ -39,7 +39,7 @@
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
+#include "avdevice.h"

 #define AUDIO_BLOCK_SIZE 4096

--- a/libavdevice/sndio_common.c
+++ b/libavdevice/sndio_common.c
@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <sndio.h>

-#include "libavformat/avformat.h"
+#include "avdevice.h"

 #include "sndio_common.h"

--- a/libavdevice/sndio_common.h
+++ b/libavdevice/sndio_common.h
@ -25,8 +25,8 @@
 #include <stdint.h>
 #include <sndio.h>

-#include "libavformat/avformat.h"
 #include "libavutil/log.h"
+#include "avdevice.h"

 typedef struct {
    AVClass *class;
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@ -22,8 +22,7 @@
 #include <stdint.h>
 #include <sndio.h>

-#include "libavformat/avformat.h"
-
+#include "avdevice.h"
 #include "sndio_common.h"

 static av_cold int audio_write_header(AVFormatContext *s1)
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@ -29,7 +29,6 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
-#include "libavformat/avformat.h"
 #include "libavcodec/dsputil.h"
 #include <unistd.h>
 #include <fcntl.h>
@ -40,6 +39,7 @@
 #include <linux/videodev.h>
 #include <time.h>
 #include <strings.h>
+#include "avdevice.h"

 typedef struct {
    AVClass *class;
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@ -29,7 +29,6 @@

 #undef __STRICT_ANSI__ //workaround due to broken kernel headers
 #include "config.h"
-#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@ -46,6 +45,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "avdevice.h"

 static const int desired_video_buffers = 256;

--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@ -19,9 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include "libavformat/avformat.h"
 #include <windows.h>
 #include <vfw.h>
+#include "avdevice.h"

 //#define DEBUG_VFW

--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@ -36,7 +36,6 @@
 */

 #include "config.h"
-#include "libavformat/avformat.h"
 #include <time.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@ -46,6 +45,7 @@
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/Xfixes.h>
+#include "avdevice.h"

 /**
 * X11 Device Demuxer context