diff options
| author | Florent Tribouilloy <florent.tribouilloy@smartjog.com> | 2013-07-25 12:55:40 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-07-28 16:39:06 +0200 |
| commit | 2186a7e547fdda716138444c8345ce8b823f2d4a (patch) | |
| tree | 8bd62265dab32c930d80c939300307f7fb1b7258 /doc | |
| parent | 2fcd400669bcb31a0c99d88cfde4f6db4b40fa45 (diff) | |
| download | ffmpeg-2186a7e547fdda716138444c8345ce8b823f2d4a.tar.gz | |
ffprobe: add -show_programs option
The option is used to sort the streams by program.
Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffprobe.texi | 14 | ||||
| -rw-r--r-- | doc/ffprobe.xsd | 24 |
2 files changed, 35 insertions, 3 deletions
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 38517a8890..02cffbb478 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -44,7 +44,8 @@ name (which may be shared by other sections), and an unique name. See the output of @option{sections}. Metadata tags stored in the container or in the streams are recognized -and printed in the corresponding "FORMAT" or "STREAM" section. +and printed in the corresponding "FORMAT", "STREAM" or "PROGRAM_STREAM" +section. @c man end @@ -209,6 +210,13 @@ multimedia stream. Each media stream information is printed within a dedicated section with name "STREAM". +@item -show_programs +Show information about programs and their streams contained in the input +multimedia stream. + +Each media stream information is printed within a dedicated section +with name "PROGRAM_STREAM". + @item -show_chapters Show information about chapters stored in the format. @@ -279,8 +287,8 @@ keyN=valN [/SECTION] @end example -Metadata tags are printed as a line in the corresponding FORMAT or -STREAM section, and are prefixed by the string "TAG:". +Metadata tags are printed as a line in the corresponding FORMAT, STREAM or +PROGRAM_STREAM section, and are prefixed by the string "TAG:". A description of the accepted options follows. diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 82cb80d048..8a1e102704 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -11,6 +11,7 @@ <xsd:element name="packets" type="ffprobe:packetsType" minOccurs="0" maxOccurs="1" /> <xsd:element name="frames" type="ffprobe:framesType" minOccurs="0" maxOccurs="1" /> <xsd:element name="streams" type="ffprobe:streamsType" minOccurs="0" maxOccurs="1" /> + <xsd:element name="programs" type="ffprobe:programsType" minOccurs="0" maxOccurs="1" /> <xsd:element name="chapters" type="ffprobe:chaptersType" minOccurs="0" maxOccurs="1" /> <xsd:element name="format" type="ffprobe:formatType" minOccurs="0" maxOccurs="1" /> <xsd:element name="error" type="ffprobe:errorType" minOccurs="0" maxOccurs="1" /> @@ -87,6 +88,12 @@ </xsd:sequence> </xsd:complexType> + <xsd:complexType name="programsType"> + <xsd:sequence> + <xsd:element name="program" type="ffprobe:programType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="streamDispositionType"> <xsd:attribute name="default" type="xsd:int" use="required" /> <xsd:attribute name="dub" type="xsd:int" use="required" /> @@ -147,6 +154,23 @@ <xsd:attribute name="nb_read_packets" type="xsd:int"/> </xsd:complexType> + <xsd:complexType name="programType"> + <xsd:sequence> + <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="streams" type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + + <xsd:attribute name="program_id" type="xsd:int" use="required"/> + <xsd:attribute name="program_num" type="xsd:int" use="required"/> + <xsd:attribute name="nb_streams" type="xsd:int" use="required"/> + <xsd:attribute name="start_time" type="xsd:float"/> + <xsd:attribute name="start_pts" type="xsd:long"/> + <xsd:attribute name="end_time" type="xsd:float"/> + <xsd:attribute name="end_pts" type="xsd:long"/> + <xsd:attribute name="pmt_pid" type="xsd:int" use="required"/> + <xsd:attribute name="pcr_pid" type="xsd:int" use="required"/> + </xsd:complexType> + <xsd:complexType name="formatType"> <xsd:sequence> <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/> |