diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 03:37:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 03:45:58 +0200 |
| commit | c3f5b8112573245fc5056a49477749df4ed1d0ea (patch) | |
| tree | d55921b265eca41f50c2dac5b317844d7ad7170d /doc | |
| parent | 3862ebba23cc9a76a004edd4c12d0b853a0426cd (diff) | |
| parent | ad1862d64ae28251e2740e437bbc639492a374a0 (diff) | |
| download | ffmpeg-c3f5b8112573245fc5056a49477749df4ed1d0ea.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ALPHA: Replace sized int_fast integer types with plain int/unsigned.
Duplicate DPX image encoder
Duplicate DPX decoder: read sample aspect ratio
Duplciate DPX decoder: add buffer size checks.
ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
ac3enc: do not store a bandwidth code for each channel.
ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
ac3enc: differentiate between current block and reference block in bit_alloc()
ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
ac3enc: simplify stereo rematrixing decision options
Include both URLs: Update URL to fate samples
Conflicts:
Changelog
doc/fate.txt
libavcodec/ac3enc.c
libavcodec/dpxenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/encoders.texi | 12 | ||||
| -rw-r--r-- | doc/fate.txt | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index 2f347f4fb1..2855d89f7a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -353,4 +353,16 @@ HDCD A/D Converter @end table +@subheading Other AC-3 Encoding Options + +@table @option + +@item -stereo_rematrixing @var{boolean} +Stereo Rematrixing. Enables/Disables use of rematrixing for stereo input. This +is an optional AC-3 feature that increases quality by selectively encoding +the left/right channels as mid/side. This option is enabled by default, and it +is highly recommended that it be left as enabled except for testing purposes. + +@end table + @c man end ENCODERS diff --git a/doc/fate.txt b/doc/fate.txt index a074ed1e5d..f8ce68ea77 100644 --- a/doc/fate.txt +++ b/doc/fate.txt @@ -8,6 +8,7 @@ that is provided separately from the actual source distribution. Use the following command to get the fate test samples # rsync -aL rsync://rsync.mplayerhq.hu:/samples/fate-suite/ fate/fate-suite +# rsync -aL rsync://fate-suite.libav.org:/fate-suite/ fate-suite To inform the build system about the testsuite location, pass `--samples=<path to the samples>` to configure or set the SAMPLES Make |