1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests/ref/acodec
Michael Niedermayer 3c54e7ed4f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
  ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
  ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
  wavpack: fix wrong return value in wavpack_decode_block()
  avconv: fix parsing metadata specifiers.
  fate: use +frame+slice named constants instead of '3'
  mpeg12: propagate more real return values through chunk decode error return and fix some indentation
  wavpack: use context reset in appropriate places
  avconv: move mux_preload and mux_max_delay to options context
  avconv: move bitstream filters to options context.
  avconv: move rate_emu to options context.
  avconv: move max_frames to options context.
  avconv: move metadata to options context.
  avconv: move ts scale to options context.
  avconv: move chapter maps to options context.
  avconv: move metadata maps to options context.
  avconv: move codec_names to options context.

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05 22:29:16 +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
aref fate: run aref and vref as regular tests 2011-05-18 14:45:46 +01:00
flac
g726
mp2
pcm matroskaenc: don't write an empty Cues element. 2011-04-07 18:11:24 +02:00
wmav1
wmav2