1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
FFmpeg/tests/ref/acodec
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
..
ac3_fixed ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. 2011-09-05 10:09:44 -04:00
adpcm_ima_qt adpcmenc: fix QT IMA ADPCM encoder 2011-05-08 13:15:48 +02:00
adpcm_ima_wav
adpcm_ms
adpcm_swf
adpcm_yam
alac movenc: create an alternate group for each media type 2011-09-17 08:42:30 +02:00
aref fate: run aref and vref as regular tests 2011-05-18 14:45:46 +01:00
flac
g726
mp2
pcm movenc: create an alternate group for each media type 2011-09-17 08:42:30 +02:00
wmav1
wmav2