diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-26 02:42:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-26 03:06:30 +0100 |
| commit | 27ef7b1bcd0577e3f5bdfc524b42b0548567be20 (patch) | |
| tree | dbb243f25cf614d4951ce9352c89befb3526ed23 /doc/ffmpeg.texi | |
| parent | 0bfe349d4a3e2a98c6f4f02fb03d8585e531d850 (diff) | |
| parent | eb81cf860cbb23ece082e6a463a2c6ced8c55ead (diff) | |
| download | ffmpeg-27ef7b1bcd0577e3f5bdfc524b42b0548567be20.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index b9b738210e..47ed58bb37 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -586,6 +586,28 @@ Set the ISO 639 language code (3 letters) of the current audio stream. @table @option @item -atag @var{fourcc/tag} Force audio tag/fourcc. +@item -audio_service_type @var{type} +Set the type of service that the audio stream contains. +@table @option +@item ma +Main Audio Service (default) +@item ef +Effects +@item vi +Visually Impaired +@item hi +Hearing Impaired +@item di +Dialogue +@item co +Commentary +@item em +Emergency +@item vo +Voice Over +@item ka +Karaoke +@end table @item -absf @var{bitstream_filter} Bitstream filters available are "dump_extra", "remove_extra", "noise", "mp3comp", "mp3decomp". @end table |