ffmpeg/libavdevice
Michael Niedermayer 345160a9cd Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
  x11grab: Check the XQueryPointer return value

Conflicts:
	libavdevice/x11grab.c

See: 69c34a6ac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05 03:42:55 +02:00
..
Makefile Skip decklink_common_c.h when running make checkheaders. 2014-09-23 22:51:36 +02:00
alldevices.c avdevice: add decklink input support 2014-09-22 02:55:24 +02:00
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 basic PCM audio support. 2014-09-28 02:31:38 +02:00
bktr.c Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
caca.c
decklink_common.cpp avdevice/decklink: move general code of decklink encoder to common file 2014-09-22 01:39:50 +02:00
decklink_common.h avdevice/decklink: move general code of decklink encoder to common file 2014-09-22 01:39:50 +02:00
decklink_common_c.h avdevice/decklink: move general code of decklink encoder to common file 2014-09-22 01:39:50 +02:00
decklink_dec.cpp avdevice: add decklink input support 2014-09-22 02:55:24 +02:00
decklink_dec.h avdevice: add decklink input support 2014-09-22 02:55:24 +02:00
decklink_dec_c.c avdevice: add decklink input support 2014-09-22 02:55:24 +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
decklink_enc_c.c avdevice/decklink: move general code of decklink encoder to common file 2014-09-22 01:39:50 +02:00
dshow.c lavd/dshow: use av_codec_get_id() 2014-08-07 13:03:17 +02:00
dshow_capture.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
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: dont assign variables to themselfs 2014-09-13 22:32:21 +02:00
libavdevice.v
libcdio.c
libdc1394.c
openal-dec.c
opengl_enc.c Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
opengl_enc_shaders.h
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
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
pulse_audio_common.c
pulse_audio_common.h
pulse_audio_dec.c Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3' 2014-08-24 21:33:59 +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
v4l.c
v4l2-common.c
v4l2-common.h
v4l2.c lavd/v4l2: introduce enqueue_buffer() 2014-09-06 00:05:59 +02:00
v4l2enc.c v4l2enc: adding AVClass 2014-07-31 18:59:20 +02:00
version.h avdevice/version: bump minor for the decklink input 2014-09-22 03:25:22 +02:00
vfwcap.c Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734' 2014-08-26 12:22:55 +02:00
x11grab.c Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303' 2014-10-05 03:42:55 +02:00
xv.c xv.c: Add missing const to lookup table. 2014-08-30 18:02:45 +02:00