diff options
| author | Clément Bœsch <clement.boesch@smartjog.com> | 2012-05-31 09:31:04 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-06-11 07:28:26 +0200 |
| commit | 9846a9c7015668b54e01a3b8dfbb24fc84616dd8 (patch) | |
| tree | 7a67bf4ca5ec5535c0002f31742cacba6bf99e59 | |
| parent | 0478d5f9fe3d6d80b82c18dc5deb4f4661da73ab (diff) | |
| download | ffmpeg-9846a9c7015668b54e01a3b8dfbb24fc84616dd8.tar.gz | |
riff: add ISMP/timecode tag.
| -rw-r--r-- | doc/ffprobe.texi | 2 | ||||
| -rw-r--r-- | doc/general.texi | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index f5fdb5b28c..2a0b172128 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -410,7 +410,7 @@ MOV timecode is extracted from tmcd track, so is available in the tmcd stream metadata (@option{-show_streams}, see @var{TAG:timecode}). @item -DV and GXF timecodes are available in format metadata +DV, GXF and AVI timecodes are available in format metadata (@option{-show_format}, see @var{TAG:timecode}). @end itemize diff --git a/doc/general.texi b/doc/general.texi index 92961ffdb0..5af7822ff3 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -890,6 +890,7 @@ performance on systems without hardware floating point support). @multitable @columnfractions .4 .1 .1 @item Codec/format @tab Read @tab Write +@item AVI @tab X @tab X @item DV @tab X @tab X @item GXF @tab X @tab X @item MOV @tab X @tab diff --git a/libavformat/riff.c b/libavformat/riff.c index 48e0c72507..9859e5813e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -389,6 +389,7 @@ const AVMetadataConv ff_riff_info_conv[] = { { "IPRD", "album" }, { "IPRT", "track" }, { "ISFT", "encoder" }, + { "ISMP", "timecode" }, { "ITCH", "encoded_by"}, { 0 }, }; @@ -396,7 +397,7 @@ const AVMetadataConv ff_riff_info_conv[] = { const char ff_riff_tags[][5] = { "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", - "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH", + "IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH", {0} }; |