ffmpeg/libavdevice
Michael Niedermayer 80acedae3e Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  oss_audio: Split muxer and demuxer

Conflicts:
	libavdevice/Makefile
	libavdevice/oss_audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 13:39:12 +02:00
..
Makefile Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h Various small spelling fixes. 2014-04-22 20:44:31 +02:00
avdeviceres.rc
avfoundation.m avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from 10.8 onward 2014-07-16 00:40:32 +02:00
bktr.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
caca.c
decklink_enc.cpp
decklink_enc.h
decklink_enc_c.c
dshow.c
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 lavd/fbdev_enc: move list device code to fbdev_common 2014-04-30 00:35:42 +02: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 Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02: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
gdigrab.c
iec61883.c
jack_audio.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
lavfi.c avutil & avdevice: remove av_bprint_fd_contents() 2014-07-15 21:49:56 +02:00
libavdevice.v
libcdio.c
libdc1394.c
openal-dec.c
opengl_enc.c fix various typos 2014-06-03 10:58:19 -08:00
opengl_enc_shaders.h
oss_audio.c Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +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 avdevice/pulse_audio_dec: reimplement using the non simple API 2014-07-09 01:36:01 +02:00
pulse_audio_enc.c lavd/pulse_audio_enc: respect minreq while checking buffer fullness 2014-04-30 00:36:14 +02:00
qtkit.m avdevice/qtkit: fix include 2014-04-24 05:12:07 +02:00
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 avdevice/v4l2: Use av_malloc_array() 2014-05-22 15:08:12 +02:00
v4l2enc.c
version.h avdevice/pulse_audio_dec: reimplement using the non simple API 2014-07-09 01:36:01 +02:00
vfwcap.c
x11grab.c lavd/x11grab: reindent after last commit. 2014-07-17 18:28:58 +02:00
xv.c avdevice/xv: fix missing { 2014-06-30 21:32:19 +02:00