Michael Niedermayer fe25194c58 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>

2015-04-09 21:07:24 +02:00

..

alldevices.c

Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

2014-10-27 21:26:51 +01:00

alsa-audio-common.c

avdevice/alsa-audio-common: Use *alloc_array()

2015-01-20 17:00:16 +01:00

alsa-audio-dec.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +02:00

alsa-audio-enc.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +02:00

alsa-audio.h

lavd/alsa: implement get_device_list callbacks

2014-11-01 01:02:02 +01: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

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

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

avdeviece: Read errno before av_log() as the callback from av_log() might affect errno

2014-10-25 13:28:51 +02:00

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

avdevice: add decklink input support

2014-09-22 02:55:24 +02:00

decklink_enc_c.c

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

decklink_enc.cpp

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

decklink_enc.h

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

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: fixup some COM objects, based on patches from Don Moir

2014-03-31 23:11:35 +02:00

dshow_enumpins.c

…

dshow_filter.c

dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions

2012-11-16 19:26:13 +01:00

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

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

fbdev_common.c

avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers

2014-11-21 18:02:41 +01:00

fbdev_common.h

lavd/fbdev_enc: move list device code to fbdev_common

2014-04-30 00:35:42 +02:00

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

lavd/fbdev_enc: move list device code to fbdev_common

2014-04-30 00:35:42 +02:00

file_open.c

libavutil: Make avpriv_open a library-internal function on msvcrt

2013-08-10 00:53:33 +03:00

gdigrab.c

gdigrab: fix gdi object leak if using mouse

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

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_audio.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +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

lavd: export all symbols with av_ prefix

2014-10-20 22:01:36 +02:00

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

dshow: introduce support for crossbar [multiple input selectable] devices

2015-01-23 06:35:16 -07: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

lavd/opengl_enc_shaders: fix gray* shader

2014-02-16 19:56:53 +01:00

opengl_enc.c

msvc: Fix compilation errors due to header include order.

2014-11-27 12:40:18 +01:00

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: avoid strerror() and errbuf

2014-11-17 23:46:56 +01:00

oss_audio.h

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +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

lavd/pulse_audio_common: add context helper functions

2014-04-18 01:42:17 +02:00

pulse_audio_dec.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +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

lavd/qtkit: Silence deprecation warnings when using clang.

2015-03-10 12:11:15 +01:00

sdl.c

lavd: add categories to device implementations

2014-03-03 23:34:46 +01:00

sndio_common.c

…

sndio_common.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

sndio_dec.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +02:00

sndio_enc.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +02:00

timefilter.c

timefilter: Handle memory allocation failure

2013-10-29 11:40:04 +00:00

timefilter.h

timefilter: Handle memory allocation failure

2013-10-29 11:40:04 +00:00

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

lavd: add categories to device implementations

2014-03-03 23:34:46 +01:00

version.h

lavd/avdevice: introduce helper functions for sink/sources listing

2015-01-11 18:58:26 +01:00

vfwcap.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +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

xv.c: Add missing const to lookup table.

2014-08-30 18:02:45 +02:00