Merge commit '5c8280c3075dd54f26752c3a1185647578421703'

[ffmpeg] / libavformat / avidec.c

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 755fe58d9714dd9af47a7d44b004f1a435e0a046..6bd8b11f754a50b35d663033e71a9e296c008712 100644 (file)
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -180,12 +180,13 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num)
 
     av_dlog(s,
             "longs_pre_entry:%d index_type:%d entries_in_use:%d "
-            "chunk_id:%X base:%16"PRIX64"\n",
+            "chunk_id:%X base:%16"PRIX64" frame_num:%d\n",
             longs_pre_entry,
             index_type,
             entries_in_use,
             chunk_id,
-            base);
+            base,
+            frame_num);
 
     if (stream_id >= s->nb_streams || stream_id < 0)
         return AVERROR_INVALIDDATA;
@@ -775,11 +776,16 @@ static int avi_read_header(AVFormatContext *s)
                     st->codec->codec_tag  = tag1;
                     st->codec->codec_id   = ff_codec_get_id(ff_codec_bmp_tags,
                                                             tag1);
+                    /* If codec is not found yet, try with the mov tags. */
                     if (!st->codec->codec_id) {
-                        st->codec->codec_id = ff_codec_get_id(ff_codec_movvideo_tags,
-                                                              tag1);
+                        char tag_buf[32];
+                        av_get_codec_tag_string(tag_buf, sizeof(tag_buf), tag1);
+                        st->codec->codec_id =
+                            ff_codec_get_id(ff_codec_movvideo_tags, tag1);
                         if (st->codec->codec_id)
-                           av_log(s, AV_LOG_WARNING, "mov tag found in avi\n");
+                           av_log(s, AV_LOG_WARNING,
+                                  "mov tag found in avi (fourcc %s)\n",
+                                  tag_buf);
                     }
                     /* This is needed to get the pict type which is necessary
                      * for generating correct pts. */