In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it

[ffmpeg] / libavformat / oggparseskeleton.c

diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c
index a3a5f75d15893111243f1e1dc7c395b3f2149be0..ad0dded0d7cb1a1f474ae32d38cd8890ec60c9ca 100644 (file)
--- a/libavformat/oggparseskeleton.c
+++ b/libavformat/oggparseskeleton.c
@@ -33,7 +33,7 @@ static int skeleton_header(AVFormatContext *s, int idx)
     int target_idx, start_time;
 
     strcpy(st->codec->codec_name, "skeleton");
-    st->codec->codec_type = CODEC_TYPE_DATA;
+    st->codec->codec_type = AVMEDIA_TYPE_DATA;
 
     if (os->psize < 8)
         return -1;
@@ -62,6 +62,7 @@ static int skeleton_header(AVFormatContext *s, int idx)
         if (start_den) {
             av_reduce(&start_time, &st->time_base.den, start_num, start_den, INT_MAX);
             st->time_base.num = 1;
+            os->lastpts =
             st->start_time = start_time;
         }
     } else if (!strncmp(buf, "fisbone", 8)) {
@@ -71,6 +72,7 @@ static int skeleton_header(AVFormatContext *s, int idx)
         target_idx = ogg_find_stream(ogg, AV_RL32(buf+12));
         start_granule = AV_RL64(buf+36);
         if (target_idx >= 0 && start_granule != -1) {
+            ogg->streams[target_idx].lastpts =
             s->streams[target_idx]->start_time = ogg_gptopts(s, target_idx, start_granule, NULL);
         }
     }