1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavdevice
Michael Niedermayer efc08e00cc Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:56:43 +02:00
..
alldevices.c Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8' 2013-01-04 13:01:54 +01: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
avdevice.h
bktr.c bktr: Add missing includes for av_gettime() 2013-03-23 23:36:58 +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_enummediatypes.c
dshow_enumpins.c
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 lavd/dshow: fix style and typo recently introduced. 2013-03-19 21:26:24 +01:00
dv1394.c dv1394: Swap the min and max values of the 'standard' option 2012-11-02 11:25:48 +02:00
dv1394.h miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
fbdev.c Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 2013-05-16 09:56:43 +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 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +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
openal-dec.c avformat/avdevice: add missing time.h includes 2013-03-12 15:28:22 +01:00
oss_audio.c oss: warn when non block mode cannot be enabled. 2012-11-05 00:28:21 +01: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
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
timefilter.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
timefilter.h
v4l2.c Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
v4l.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
version.h avdevice: bump major 2013-03-14 13:53:41 +01:00
vfwcap.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x11grab.c x11grab: fix mixed declaration and code 2012-10-29 22:24:10 +01:00