diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:03:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 13:03:09 +0200 |
| commit | 48480da6ad0f53e8d9d68162e8d003f557221fc2 (patch) | |
| tree | e6032b1df7c55f07d7b677b0e56a8dce5ef82952 | |
| parent | bc6e535db13222d7de97b774639e6a7d42afd91c (diff) | |
| parent | 48f2e53ad0c8586369c3ce88712f0b9cec5a4c47 (diff) | |
| download | ffmpeg-48480da6ad0f53e8d9d68162e8d003f557221fc2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document the asf demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/demuxers.texi | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 140f0b1fe6..44db21f697 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -29,6 +29,17 @@ the caller can decide which variant streams to actually receive. The total bitrate of the variant that the stream belongs to is available in a metadata key named "variant_bitrate". +@section asf + +Advanced Systems Format demuxer. + +This demuxer is used to demux ASF files and MMS network streams. + +@table @option +@item -no_resync_search @var{bool} +Do not try to resynchronize by looking for a certain optional start code. +@end table + @anchor{concat} @section concat @@ -110,7 +121,7 @@ Adobe Flash Video Format demuxer. This demuxer is used to demux FLV files and RTMP network streams. @table @option -@item -flv_demuxer @var{bool} +@item -flv_metadata @var{bool} Allocate the streams according to the onMetaData array content. @end table |