Michael Niedermayer c18a3b3e8e Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2' ...

* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
	libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-19 18:33:46 +02:00

..

alldevices.c

…

alsa-audio-common.c

…

alsa-audio-dec.c

…

alsa-audio-enc.c

…

alsa-audio.h

…

avdevice.c

…

avdevice.h

…

avdeviceres.rc

…

avfoundation.m

lavd/avfoundation: Add device category.

2014-08-05 01:36:26 +02:00

bktr.c

Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'

2014-07-18 21:48:37 +02:00

caca.c

…

decklink_enc_c.c

…

decklink_enc.cpp

…

decklink_enc.h

…

dshow_capture.h

…

dshow_common.c

…

dshow_enummediatypes.c

…

dshow_enumpins.c

…

dshow_filter.c

…

dshow_pin.c

…

dshow.c

lavd/dshow: use av_codec_get_id()

2014-08-07 13:03:17 +02:00

dv1394.c

…

dv1394.h

…

fbdev_common.c

…

fbdev_common.h

…

fbdev_dec.c

Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'

2014-07-18 21:48:37 +02:00

fbdev_enc.c

…

file_open.c

…

gdigrab.c

gdigrab: fix gdi object leak if using mouse

2014-08-19 16:07:28 +02:00

iec61883.c

lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()

2014-08-07 04:28:11 +02:00

jack_audio.c

Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'

2014-07-18 21:48:37 +02:00

lavfi.c

avdevice/lavfi: Simplify non-AV stream check

2014-08-07 15:41:17 +02:00

libavdevice.v

…

libcdio.c

…

libdc1394.c

…

Makefile

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +02:00

openal-dec.c

…

opengl_enc_shaders.h

…

opengl_enc.c

…

oss_audio_dec.c

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +02:00

oss_audio_enc.c

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +02:00

oss_audio.c

avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue

2014-07-31 21:19:15 +02:00

oss_audio.h

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +02:00

pulse_audio_common.c

…

pulse_audio_common.h

…

pulse_audio_dec.c

lavd/pulse_audio_dec: use default source when no input provided

2014-08-18 22:36:46 +02:00

pulse_audio_enc.c

avdevice/pulse_audio_enc: use getter function for AVFrame.channels

2014-07-28 20:06:11 +02:00

qtkit.m

…

sdl.c

…

sndio_common.c

…

sndio_common.h

…

sndio_dec.c

…

sndio_enc.c

…

timefilter.c

…

timefilter.h

…

v4l2-common.c

…

v4l2-common.h

…

v4l2.c

avdevice/v4l2: try to fix build for openbsd

2014-08-18 14:03:03 +02:00

v4l2enc.c

v4l2enc: adding AVClass

2014-07-31 18:59:20 +02:00

v4l.c

…

version.h

Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'

2014-08-10 00:26:45 +02:00

vfwcap.c

Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

2014-08-19 18:33:46 +02:00

x11grab.c

lavd/x11grab: reindent after last commit.

2014-07-17 18:28:58 +02:00

xv.c

avdevice/xv: fix missing {

2014-06-30 21:32:19 +02:00