[Ffmpeg-cvslog] r7600 - trunk/libavformat/utils.c

[michael]

Author: michael
Date: Sun Jan 21 13:31:58 2007
New Revision: 7600

Modified:
   trunk/libavformat/utils.c

Log:
set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables


Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Sun Jan 21 13:31:58 2007
@@ -2182,6 +2182,17 @@
             }
             break;
         }
+
+        if(s->oformat->codec_tag){
+            if(st->codec->codec_tag){
+                //FIXME
+                //check that tag + id is in the table
+                //if neither is in the table -> ok
+                //if tag is in the table with another id -> FAIL
+                //if id is in the table with another tag -> FAIL unless strict < ?
+            }else
+                st->codec->codec_tag= av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id);
+        }
     }
 
     if (!s->priv_data && s->oformat->priv_data_size > 0) {