From 9846a9c7015668b54e01a3b8dfbb24fc84616dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <clement.boesch@smartjog.com>
Date: Thu, 31 May 2012 09:31:04 +0200
Subject: [PATCH] riff: add ISMP/timecode tag.

---
 doc/ffprobe.texi   | 2 +-
 doc/general.texi   | 1 +
 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}
 };