ffmpeg/libavdevice
Michael Niedermayer d4a6c94046 Merge commit '4f373a5111f900af54301907132942f95276285c'
* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
	libavdevice/vfwcap.c

See: 4d0f6d3fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 02:19:32 +02:00
..
alldevices.c Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96' 2014-10-27 21:26:51 +01:00
alsa_dec.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
alsa_enc.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
alsa.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
alsa.h Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
avdevice.c avdevice: Use av_format_get_control_message_cb() 2015-01-16 02:13:01 +01:00
avdevice.h lavd/avdevice: introduce helper functions for sink/sources listing 2015-01-11 18:58:26 +01:00
avdeviceres.rc
avfoundation.m avdevice/avfoundation: Fix occured typo 2015-03-30 21:41:17 +02:00
bktr.c Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' 2015-02-16 02:56:17 +01:00
caca.c
decklink_common_c.h avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_common.cpp avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__ 2015-02-08 04:52:52 +01:00
decklink_common.h avdevice/decklink_common: Fix "Cross-compiling FFmpeg on Debian for Windows with MinGW-w64" 2014-11-25 04:40:49 +01:00
decklink_dec_c.c avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_dec.cpp avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_dec.h
decklink_enc_c.c
decklink_enc.cpp
decklink_enc.h
dshow_capture.h dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once 2015-01-26 01:29:58 -07:00
dshow_common.c
dshow_crossbar.c dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once 2015-01-26 01:29:58 -07:00
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c dshow: tweak logging 2015-01-26 02:04:30 -07:00
dshow.c dshow: tweak logging 2015-01-26 02:04:30 -07:00
dv1394.c avdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memory 2014-12-28 18:16:02 +01:00
dv1394.h
fbdev_common.c avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers 2014-11-21 18:02:41 +01:00
fbdev_common.h
fbdev_dec.c avdevice/fbdev_dec: use errno instead of ret for av_log 2014-10-29 21:44:19 +01:00
fbdev_enc.c
file_open.c
gdigrab.c
iec61883.c Fix standalone compilation of the iec61883 input device. 2014-12-04 01:35:47 +01:00
internal.h lavd/avdevice: introduce helper functions for sink/sources listing 2015-01-11 18:58:26 +01:00
jack.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
lavfi.c avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory 2015-01-08 14:11:44 +01:00
libavdevice.v
libcdio.c lavd/libcdio: add more paranoia mode constants 2015-01-31 11:32:05 +01:00
libdc1394.c Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200' 2015-04-09 21:07:24 +02:00
Makefile Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
openal-dec.c avdevice/openal-dec: Check the return code of av_new_packet() 2015-01-19 00:34:18 +01:00
opengl_enc_shaders.h
opengl_enc.c msvc: Fix compilation errors due to header include order. 2014-11-27 12:40:18 +01:00
oss_dec.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
oss_enc.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
oss.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
oss.h Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
pulse_audio_common.c avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointers 2014-11-21 18:02:01 +01:00
pulse_audio_common.h
pulse_audio_dec.c Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200' 2015-04-09 21:07:24 +02:00
pulse_audio_enc.c
qtkit.m lavd/qtkit: Silence deprecation warnings when using clang. 2015-03-10 12:11:15 +01:00
sdl.c
sndio_dec.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
sndio_enc.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
sndio.c Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
sndio.h Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 2015-04-09 21:36:42 +02:00
timefilter.c
timefilter.h
utils.c lavd/avdevice: introduce helper functions for sink/sources listing 2015-01-11 18:58:26 +01:00
v4l2-common.c v4l2: support MPEG4 compressed streams 2014-11-05 19:15:14 +01:00
v4l2-common.h lavd/v4l2: don't use avpriv_ prefix for internal functions 2014-10-29 16:12:14 +01:00
v4l2.c fix spelling errors 2015-03-06 21:35:00 +01:00
v4l2enc.c lavd/v4l2: don't use avpriv_ prefix for internal functions 2014-10-29 16:12:14 +01:00
v4l.c
version.h lavd/avdevice: introduce helper functions for sink/sources listing 2015-01-11 18:58:26 +01:00
vfwcap.c Merge commit '4f373a5111f900af54301907132942f95276285c' 2015-04-11 02:19:32 +02:00
x11grab.c Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200' 2015-04-09 21:07:24 +02:00
xcbgrab.c Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200' 2015-04-09 21:07:24 +02:00
xv.c