mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-29 10:52:20 +00:00
706bd8ea19
* qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
49 lines
2.2 KiB
Makefile
49 lines
2.2 KiB
Makefile
include $(SUBDIR)../config.mak
|
|
|
|
NAME = avdevice
|
|
FFLIBS = avformat avcodec avutil
|
|
FFLIBS-$(CONFIG_LAVFI_INDEV) += avfilter
|
|
|
|
HEADERS = avdevice.h \
|
|
version.h \
|
|
|
|
OBJS = alldevices.o \
|
|
avdevice.o \
|
|
|
|
# input/output devices
|
|
OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
|
|
alsa-audio-dec.o timefilter.o
|
|
OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \
|
|
alsa-audio-enc.o
|
|
OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
|
|
OBJS-$(CONFIG_CACA_OUTDEV) += caca.o
|
|
OBJS-$(CONFIG_DSHOW_INDEV) += dshow.o dshow_enummediatypes.o \
|
|
dshow_enumpins.o dshow_filter.o \
|
|
dshow_pin.o dshow_common.o
|
|
OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
|
|
OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o
|
|
OBJS-$(CONFIG_IEC61883_INDEV) += iec61883.o
|
|
OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o
|
|
OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o
|
|
OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o
|
|
OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
|
|
OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
|
|
OBJS-$(CONFIG_PULSE_INDEV) += pulse.o
|
|
OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o
|
|
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
|
|
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
|
|
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o timefilter.o
|
|
OBJS-$(CONFIG_V4L_INDEV) += v4l.o
|
|
OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
|
|
OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o
|
|
|
|
# external libraries
|
|
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
|
|
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
|
|
|
|
SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow_capture.h
|
|
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
|
|
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
|
|
|
|
TESTPROGS = timefilter
|