generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-28 13:03:09 +02:00
commit 48480da6ad
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/demuxers.texi
View File

@ -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 The total bitrate of the variant that the stream belongs to is
available in a metadata key named "variant_bitrate". 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} @anchor{concat}
@section concat @section concat
@ -110,7 +121,7 @@ Adobe Flash Video Format demuxer.
This demuxer is used to demux FLV files and RTMP network streams. This demuxer is used to demux FLV files and RTMP network streams.
@table @option @table @option
@item -flv_demuxer @var{bool} @item -flv_metadata @var{bool}
Allocate the streams according to the onMetaData array content. Allocate the streams according to the onMetaData array content.
@end table @end table