Michael Niedermayer cde6e328de Merge commit '619d5e7db88941cadb8136f805564e885c6c6434' ...

* commit '619d5e7db88941cadb8136f805564e885c6c6434':
  v4l2: Use the codec descriptor facility

Conflicts:
	libavdevice/v4l2.c

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

2015-03-02 20:16:22 +01:00

..

alldevices.c

…

alsa-audio-common.c

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

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

alsa-audio-dec.c

lavd/alsa: set frame_size field.

2015-02-26 19:19:56 +01:00

alsa-audio-enc.c

…

alsa-audio.h

…

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

…

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

…

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

…

fbdev_common.h

…

fbdev_dec.c

…

fbdev_enc.c

…

file_open.c

…

gdigrab.c

…

iec61883.c

…

internal.h

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

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

jack_audio.c

…

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 '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

2015-01-28 20:29:29 +01: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

…

opengl_enc.c

…

oss_audio_dec.c

…

oss_audio_enc.c

…

oss_audio.c

…

oss_audio.h

…

pulse_audio_common.c

…

pulse_audio_common.h

…

pulse_audio_dec.c

avdevice/pulse_audio_dec: remove double ;;

2015-01-18 00:35:04 +01:00

pulse_audio_enc.c

…

qtkit.m

…

sdl.c

…

sndio_common.c

…

sndio_common.h

…

sndio_dec.c

…

sndio_enc.c

…

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-common.h

…

v4l2.c

Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'

2015-03-02 20:16:22 +01:00

v4l2enc.c

…

v4l.c

…

version.h

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

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

vfwcap.c

…

x11grab.c

Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'

2015-03-01 00:17:36 +01:00

xcbgrab.c

Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'

2015-02-25 01:44:49 +01:00

xv.c

…