Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped

[ffmpeg] / libavformat / ffmdec.c

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 95b186ed3e5b484d825a29dc42d31e59ad2ff0d6..d2f16336c22183ee117e4140a63a4e84efc0d0a9 100644 (file)
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -190,7 +190,7 @@ static int64_t get_dts(AVFormatContext *s, int64_t pos)
     url_fskip(pb, 4);
     dts = get_be64(pb);
 #ifdef DEBUG_SEEK
-    av_log(s, AV_LOG_DEBUG, "pts=%0.6f\n", pts / 1000000.0);
+    av_log(s, AV_LOG_DEBUG, "dts=%0.6f\n", dts / 1000000.0);
 #endif
     return dts;
 }
@@ -287,7 +287,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
         st = av_new_stream(s, 0);
         if (!st)
             goto fail;
-        s->streams[i] = st;
 
         av_set_pts_info(st, 64, 1, 1000000);
 
@@ -337,6 +336,19 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
             codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
             codec->codec_tag = get_be32(pb);
             codec->thread_count = get_byte(pb);
+            codec->coder_type = get_be32(pb);
+            codec->me_cmp = get_be32(pb);
+            codec->partitions = get_be32(pb);
+            codec->me_subpel_quality = get_be32(pb);
+            codec->me_range = get_be32(pb);
+            codec->keyint_min = get_be32(pb);
+            codec->scenechange_threshold = get_be32(pb);
+            codec->b_frame_strategy = get_be32(pb);
+            codec->qcompress = av_int2dbl(get_be64(pb));
+            codec->qblur = av_int2dbl(get_be64(pb));
+            codec->max_qdiff = get_be32(pb);
+            codec->refs = get_be32(pb);
+            codec->directpred = get_be32(pb);
             break;
         case CODEC_TYPE_AUDIO:
             codec->sample_rate = get_be32(pb);