Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/2/head
Stefano Sabatini 14 years ago
parent e48993e3cf
commit 6b899e16de
20 changed files with 19 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      libavdevice/alldevices.c
  2. 2
      libavdevice/alsa-audio-common.c
  3. 2
      libavdevice/alsa-audio-dec.c
  4. 2
      libavdevice/alsa-audio-enc.c
  5. 2
      libavdevice/alsa-audio.h
  6. 2
      libavdevice/bktr.c
  7. 2
      libavdevice/dshow.c
  8. 2
      libavdevice/dshow.h
  9. 2
      libavdevice/dv1394.c
  10. 2
      libavdevice/fbdev.c
  11. 2
      libavdevice/jack_audio.c
  12. 2
      libavdevice/libdc1394.c
  13. 2
      libavdevice/oss_audio.c
  14. 2
      libavdevice/sndio_common.c
  15. 2
      libavdevice/sndio_common.h
  16. 3
      libavdevice/sndio_enc.c
  17. 2
      libavdevice/v4l.c
  18. 2
      libavdevice/v4l2.c
  19. 2
      libavdevice/vfwcap.c
  20. 2
      libavdevice/x11grab.c

1
libavdevice/alldevices.c
Unescape View File

@ -19,7 +19,6 @@
*/ */
#include "config.h" #include "config.h"
#include "libavformat/avformat.h"
#include "avdevice.h" #include "avdevice.h"
#define REGISTER_OUTDEV(X,x) { \ #define REGISTER_OUTDEV(X,x) { \

2
libavdevice/alsa-audio-common.c
Unescape View File

@ -29,7 +29,7 @@
*/ */
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h" #include "avdevice.h"
#include "alsa-audio.h" #include "alsa-audio.h"

2
libavdevice/alsa-audio-dec.c
Unescape View File

@ -46,9 +46,9 @@
*/ */
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avdevice.h"
#include "alsa-audio.h" #include "alsa-audio.h"
static av_cold int audio_read_header(AVFormatContext *s1, static av_cold int audio_read_header(AVFormatContext *s1,

2
libavdevice/alsa-audio-enc.c
Unescape View File

@ -38,8 +38,8 @@
*/ */
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "avdevice.h"
#include "alsa-audio.h" #include "alsa-audio.h"
static av_cold int audio_write_header(AVFormatContext *s1) static av_cold int audio_write_header(AVFormatContext *s1)

2
libavdevice/alsa-audio.h
Unescape View File

@ -32,8 +32,8 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "config.h" #include "config.h"
#include "libavformat/avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "avdevice.h"
/* XXX: we make the assumption that the soundcard accepts this format */ /* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in /* XXX: find better solution with "preinit" method, needed also in

2
libavdevice/bktr.c
Unescape View File

@ -24,7 +24,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavformat/avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
@ -47,6 +46,7 @@
#include <signal.h> #include <signal.h>
#include <stdint.h> #include <stdint.h>
#include <strings.h> #include <strings.h>
#include "avdevice.h"
typedef struct { typedef struct {
AVClass *class; AVClass *class;

2
libavdevice/dshow.c
Unescape View File

@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavformat/avformat.h"
#include "libavformat/timefilter.h" #include "libavformat/timefilter.h"
#include "avdevice.h"
#include "dshow.h" #include "dshow.h"
struct dshow_ctx { struct dshow_ctx {

2
libavdevice/dshow.h
Unescape View File

@ -21,7 +21,7 @@
#define DSHOWDEBUG 0 #define DSHOWDEBUG 0
#include "libavformat/avformat.h" #include "avdevice.h"
#define COBJMACROS #define COBJMACROS
#include <windows.h> #include <windows.h>

2
libavdevice/dv1394.c
Unescape View File

@ -32,7 +32,7 @@
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/avformat.h" #include "avdevice.h"
#undef DV1394_DEBUG #undef DV1394_DEBUG

2
libavdevice/fbdev.c
Unescape View File

@ -39,7 +39,7 @@
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavformat/avformat.h" #include "avdevice.h"
struct rgb_pixfmt_map_entry { struct rgb_pixfmt_map_entry {
int bits_per_pixel; int bits_per_pixel;

2
libavdevice/jack_audio.c
Unescape View File

@ -27,8 +27,8 @@
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
#include "libavformat/timefilter.h" #include "libavformat/timefilter.h"
#include "avdevice.h"
/** /**
* Size of the internal FIFO buffers as a number of audio packets * Size of the internal FIFO buffers as a number of audio packets

2
libavdevice/libdc1394.c
Unescape View File

@ -21,9 +21,9 @@
*/ */
#include "config.h" #include "config.h"
#include "libavformat/avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avdevice.h"
#if HAVE_LIBDC1394_2 #if HAVE_LIBDC1394_2
#include <dc1394/dc1394.h> #include <dc1394/dc1394.h>

2
libavdevice/oss_audio.c
Unescape View File

@ -39,7 +39,7 @@
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavformat/avformat.h" #include "avdevice.h"
#define AUDIO_BLOCK_SIZE 4096 #define AUDIO_BLOCK_SIZE 4096

2
libavdevice/sndio_common.c
Unescape View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <sndio.h> #include <sndio.h>
#include "libavformat/avformat.h" #include "avdevice.h"
#include "sndio_common.h" #include "sndio_common.h"

2
libavdevice/sndio_common.h
Unescape View File

@ -25,8 +25,8 @@
#include <stdint.h> #include <stdint.h>
#include <sndio.h> #include <sndio.h>
#include "libavformat/avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "avdevice.h"
typedef struct { typedef struct {
AVClass *class; AVClass *class;

3
libavdevice/sndio_enc.c
Unescape View File

@ -22,8 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <sndio.h> #include <sndio.h>
#include "libavformat/avformat.h" #include "avdevice.h"
#include "sndio_common.h" #include "sndio_common.h"
static av_cold int audio_write_header(AVFormatContext *s1) static av_cold int audio_write_header(AVFormatContext *s1)

2
libavdevice/v4l.c
Unescape View File

@ -29,7 +29,6 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/avformat.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -40,6 +39,7 @@
#include <linux/videodev.h> #include <linux/videodev.h>
#include <time.h> #include <time.h>
#include <strings.h> #include <strings.h>
#include "avdevice.h"
typedef struct { typedef struct {
AVClass *class; AVClass *class;

2
libavdevice/v4l2.c
Unescape View File

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

2
libavdevice/vfwcap.c
Unescape View File

@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavformat/avformat.h"
#include <windows.h> #include <windows.h>
#include <vfw.h> #include <vfw.h>
#include "avdevice.h"
//#define DEBUG_VFW //#define DEBUG_VFW

2
libavdevice/x11grab.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save