1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavdevice
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 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 lavd/alsa: set frame_size field. 2015-02-26 19:19:56 +01:00
alsa-audio-enc.c lavd/alsa: implement get_device_list callbacks 2014-11-01 01:02:02 +01: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
avfoundation.m lavd/avfoundation: Introduce device alias 'none' to allow the user to record only audio or video. 2014-11-14 18:28:12 +01: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_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_audio.c Merge commit '2cd28693a59050717cb7da6cb229e606b1dee356' 2014-10-29 21:59:30 +01: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 '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 msvc: Fix compilation errors due to header include order. 2014-11-27 12:40:18 +01:00
oss_audio_dec.c
oss_audio_enc.c
oss_audio.c avdevice/oss_audio: avoid strerror() and errbuf 2014-11-17 23:46:56 +01:00
oss_audio.h
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 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: 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 Merge commit '619d5e7db88941cadb8136f805564e885c6c6434' 2015-03-02 20:16:22 +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
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