Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
* commit 'c201069fac9a76e6604f9d84d76a172434d62200': avdevice: Add missing header for NULL_IF_CONFIG_SMALL Conflicts: libavdevice/alsa-audio-dec.c libavdevice/alsa-audio-enc.c libavdevice/pulse_audio_dec.c libavdevice/sndio_enc.c libavdevice/vfwcap.c libavdevice/x11grab.c libavdevice/xcbgrab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
fe25194c58
@ -46,11 +46,14 @@
|
||||
*/
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
#include "libavformat/internal.h"
|
||||
#include "libavutil/opt.h"
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "avdevice.h"
|
||||
#include "alsa-audio.h"
|
||||
|
||||
|
@ -39,7 +39,10 @@
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
|
||||
#include "libavformat/internal.h"
|
||||
#include "avdevice.h"
|
||||
#include "alsa-audio.h"
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <semaphore.h>
|
||||
#include <jack/jack.h>
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/fifo.h"
|
||||
#include "libavutil/opt.h"
|
||||
|
@ -21,13 +21,6 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
|
||||
#if HAVE_LIBDC1394_2
|
||||
#include <dc1394/dc1394.h>
|
||||
@ -48,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
|
||||
|
@ -23,10 +23,13 @@
|
||||
|
||||
#include <pulse/rtclock.h>
|
||||
#include <pulse/error.h>
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
#include "pulse_audio_common.h"
|
||||
#include "timefilter.h"
|
||||
|
||||
|
@ -22,11 +22,13 @@
|
||||
#include <stdint.h>
|
||||
#include <sndio.h>
|
||||
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "sndio_common.h"
|
||||
|
||||
static av_cold int audio_read_header(AVFormatContext *s1)
|
||||
|
@ -22,6 +22,9 @@
|
||||
#include <stdint.h>
|
||||
#include <sndio.h>
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
|
||||
|
||||
#include "avdevice.h"
|
||||
#include "sndio_common.h"
|
||||
|
||||
|
@ -19,12 +19,16 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libavformat/internal.h"
|
||||
#include <vfw.h>
|
||||
#include <windows.h>
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
#include <windows.h>
|
||||
#include <vfw.h>
|
||||
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "avdevice.h"
|
||||
|
||||
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
|
||||
|
@ -52,8 +52,7 @@
|
||||
#include <X11/extensions/Xfixes.h>
|
||||
#include <X11/extensions/XShm.h>
|
||||
|
||||
#include "avdevice.h"
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
@ -61,6 +60,8 @@
|
||||
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "avdevice.h"
|
||||
|
||||
/** X11 device demuxer context */
|
||||
typedef struct X11GrabContext {
|
||||
const AVClass *class; /**< Class for private options. */
|
||||
|
@ -37,14 +37,15 @@
|
||||
#include <xcb/shape.h>
|
||||
#endif
|
||||
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/parseutils.h"
|
||||
#include "libavutil/time.h"
|
||||
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/internal.h"
|
||||
|
||||
typedef struct XCBGrabContext {
|
||||
const AVClass *class;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user