RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity
e55092b12b
ffmpeg/libavdevice
History
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
avdevice.c
avdevice.h
bktr.c bktr: Add missing includes for av_gettime() 2013-03-23 23:36:58 +02:00
caca.c
dshow_capture.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
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.h
fbdev.c Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 2013-05-16 09:56:43 +02:00
iec61883.c
jack_audio.c
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
Makefile
openal-dec.c avformat/avdevice: add missing time.h includes 2013-03-12 15:28:22 +01:00
oss_audio.c
pulse.c
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
sndio_dec.c sndio_dec: Add missing includes for av_gettime() 2013-03-24 13:20:53 +02:00
sndio_enc.c
timefilter.c
timefilter.h
v4l2.c Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 2013-05-04 10:17:52 +02:00
v4l.c
version.h avdevice: bump major 2013-03-14 13:53:41 +01:00
vfwcap.c
x11grab.c