RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavdevice
History
Michael Niedermayer 9a9ceb8776 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add select filter
  oggdec: fix out of bound write in the ogg demuxer
  movenc: create an alternate group for each media type
  lavd: add libcdio-paranoia input device for audio CD grabbing
  rawdec: refactor private option for raw video demuxers
  pcmdec: use unique classes for all pcm demuxers.
  rawdec: g722 is always 1 channel/16kHz

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavfilter/vf_select.c
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-09-17 22:36:43 +02:00
..
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
alldevices.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
alsa-audio-enc.c ALSA: implement get_output_timestamp. 2011-07-01 09:49:32 +02:00
alsa-audio.h alsa: increase max buffer size 2011-09-12 06:16:40 +02:00
avdevice.c
…
avdevice.h Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
dshow.c dshow: remove filters from graph before releasing them 2011-09-16 11:16:05 +02:00
dshow.h dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_common.c dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c
…
dshow_enumpins.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_filter.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_pin.c dshow: release pin on disconnect 2011-09-16 11:16:05 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
dv1394.h
…
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
lavfi.c lavdev/lavfi: reindent after the last commit 2011-09-16 21:22:11 +02:00
libavdevice.v
…
libcdio.c lavd: add libcdio-paranoia input device for audio CD grabbing 2011-09-17 06:45:26 +02:00
libdc1394.c lavf,lavd: remove all usage of AVFormatParameters from demuxers. 2011-08-15 19:59:48 +02:00
openal-dec.c openal-dec: fix missing list_devices unit for list_devices AVOption 2011-09-02 05:28:31 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
sdl.c sdl: align option fields after last commit 2011-06-05 13:55:02 +02:00
sndio_common.c
…
sndio_common.h
…
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
sndio_enc.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
v4l.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-09-01 01:31:03 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
vfwcap.c vfwcap: actually use framerate option 2011-09-06 21:12:45 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00