Michael Niedermayer 95fa1fe437 Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a' ...

* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
  libavdevice: use avpriv_open()

Conflicts:
	libavdevice/v4l2.c

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

2013-08-08 11:36:21 +02:00

..

alldevices.c

lavd: add xv output device

2013-05-30 10:44:54 +02:00

alsa-audio-common.c

lavd/alsa: simplify reordering functions definition.

2013-02-02 14:13:11 +01:00

alsa-audio-dec.c

avformat/avdevice: add missing time.h includes

2013-03-12 15:28:22 +01:00

alsa-audio-enc.c

avformat/avdevice: add missing time.h includes

2013-03-12 15:28:22 +01:00

alsa-audio.h

Merge remote-tracking branch 'qatar/master'

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

avdevice.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

avdevice.h

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

bktr.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

caca.c

caca: fix 10l typo

2012-10-12 19:05:58 +02:00

dshow_capture.h

dshow: handle events in graph

2012-12-17 03:44:12 -02:00

dshow_common.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_enummediatypes.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

dshow_enumpins.c

dshow: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +02:00

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_pin: dont return a value from a void function

2013-03-25 22:12:07 +01:00

dshow.c

avdevice/dshow: make constant arrays static

2013-08-03 22:24:11 +02:00

dv1394.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

dv1394.h

miscellaneous typo fixes

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

fbdev.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

iec61883.c

Update iec61883 to handle multiple devices, and allow

2012-11-13 19:44:21 +01:00

jack_audio.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

lavfi.c

avdevice/lavfi: fix input with unknown channel layout

2013-07-13 23:10:05 +02:00

libavdevice.v

…

libcdio.c

libcdio: support recent cdio-paranoia

2013-01-17 21:41:18 +01:00

libdc1394.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

Makefile

lavd: add xv output device

2013-05-30 10:44:54 +02:00

openal-dec.c

avformat/avdevice: add missing time.h includes

2013-03-12 15:28:22 +01:00

oss_audio.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

pulse.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sdl.c

libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode

2013-03-18 20:44:21 +01:00

sndio_common.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sndio_common.h

Merge remote-tracking branch 'qatar/master'

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

sndio_dec.c

sndio_dec: Add missing includes for av_gettime()

2013-03-24 13:20:53 +02:00

sndio_enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

timefilter.c

avdevice/timefilter: 2nd try at avoiding rounding issues

2013-08-03 16:15:13 +02:00

timefilter.h

timefilter: allow to evaluate at other times.

2012-04-04 14:32:44 +02:00

v4l2-common.c

lavd/v4l2: move pixel format conversion code to a separate place.

2013-05-20 01:11:28 +02:00

v4l2-common.h

lavd/v4l2: move pixel format conversion code to a separate place.

2013-05-20 01:11:28 +02:00

v4l2.c

libavdevice: use avpriv_open()

2013-08-07 21:16:05 +02:00

v4l2enc.c

lavd/v4l2enc: check write return value.

2013-05-20 16:33:21 +02:00

v4l.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

version.h

avformat/AVFormatContext: Move fields down to match the fork

2013-07-09 19:06:32 +02:00

vfwcap.c

avdevice/vfwcap: make constant arrays static

2013-08-03 22:24:31 +02:00

x11grab.c

avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

2013-07-26 15:21:21 +00:00

xv.c

lavd: add xv output device

2013-05-30 10:44:54 +02:00