From 6b899e16de94c05203008d969523a642147a5e4b Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 26 May 2011 19:11:25 +0200 Subject: [PATCH] lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h --- libavdevice/alldevices.c | 1 - libavdevice/alsa-audio-common.c | 2 +- libavdevice/alsa-audio-dec.c | 2 +- libavdevice/alsa-audio-enc.c | 2 +- libavdevice/alsa-audio.h | 2 +- libavdevice/bktr.c | 2 +- libavdevice/dshow.c | 2 +- libavdevice/dshow.h | 2 +- libavdevice/dv1394.c | 2 +- libavdevice/fbdev.c | 2 +- libavdevice/jack_audio.c | 2 +- libavdevice/libdc1394.c | 2 +- libavdevice/oss_audio.c | 2 +- libavdevice/sndio_common.c | 2 +- libavdevice/sndio_common.h | 2 +- libavdevice/sndio_enc.c | 3 +-- libavdevice/v4l.c | 2 +- libavdevice/v4l2.c | 2 +- libavdevice/vfwcap.c | 2 +- libavdevice/x11grab.c | 2 +- 20 files changed, 19 insertions(+), 21 deletions(-) diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index fad7758944..3021f08bda 100644 --- 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) { \ diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index c00e973e1a..38466a06ce 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c @@ -29,7 +29,7 @@ */ #include -#include "libavformat/avformat.h" +#include "avdevice.h" #include "alsa-audio.h" diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 24abc7c187..2424c022d3 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -46,9 +46,9 @@ */ #include -#include "libavformat/avformat.h" #include "libavutil/opt.h" +#include "avdevice.h" #include "alsa-audio.h" static av_cold int audio_read_header(AVFormatContext *s1, diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index 0bc53b6f54..a53c1763d5 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -38,8 +38,8 @@ */ #include -#include "libavformat/avformat.h" +#include "avdevice.h" #include "alsa-audio.h" static av_cold int audio_write_header(AVFormatContext *s1) diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h index a7a000c18c..431401bb13 100644 --- a/libavdevice/alsa-audio.h +++ b/libavdevice/alsa-audio.h @@ -32,8 +32,8 @@ #include #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 diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 0e57258f14..7b0f1b7382 100644 --- 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 #include #include +#include "avdevice.h" typedef struct { AVClass *class; diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 901c766696..348fda6ecd 100644 --- 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 { diff --git a/libavdevice/dshow.h b/libavdevice/dshow.h index c991c02ecb..4e79680d98 100644 --- 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 diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 7fa73bdf95..4a84383264 100644 --- 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 diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 4f670e9875..19bf5ad5ef 100644 --- 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; diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index 9062e7f2dd..f78a2c9164 100644 --- 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 diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index b2585ac260..cf9e03233e 100644 --- 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 diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 66c303272e..2fde491a07 100644 --- 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 diff --git a/libavdevice/sndio_common.c b/libavdevice/sndio_common.c index 7e3b9a3eb9..048e72e8a2 100644 --- a/libavdevice/sndio_common.c +++ b/libavdevice/sndio_common.c @@ -22,7 +22,7 @@ #include #include -#include "libavformat/avformat.h" +#include "avdevice.h" #include "sndio_common.h" diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio_common.h index 1d0039564e..12218b4b24 100644 --- a/libavdevice/sndio_common.h +++ b/libavdevice/sndio_common.h @@ -25,8 +25,8 @@ #include #include -#include "libavformat/avformat.h" #include "libavutil/log.h" +#include "avdevice.h" typedef struct { AVClass *class; diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index 30f19107cd..9ad5cad08a 100644 --- a/libavdevice/sndio_enc.c +++ b/libavdevice/sndio_enc.c @@ -22,8 +22,7 @@ #include #include -#include "libavformat/avformat.h" - +#include "avdevice.h" #include "sndio_common.h" static av_cold int audio_write_header(AVFormatContext *s1) diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 337b489e92..28a4e94599 100644 --- 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 #include @@ -40,6 +39,7 @@ #include #include #include +#include "avdevice.h" typedef struct { AVClass *class; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index a0fc99242e..f219305672 100644 --- 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 #include #include @@ -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; diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index b8ca419b40..b8b8f52deb 100644 --- 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 #include +#include "avdevice.h" //#define DEBUG_VFW diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 090af4930f..a41e11ab57 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -36,7 +36,6 @@ */ #include "config.h" -#include "libavformat/avformat.h" #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include "avdevice.h" /** * X11 Device Demuxer context