lavf: deprecate r_frame_rate.

[ffmpeg] / libavformat / segafilm.c

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 9bf81d30d496c8907e38685ddcff95c5c3d0f4cd..23cb3ed1ed2eb87b7db4ecabfcef25d6e236ee56 100644 (file)
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "internal.h"
 
 #define FILM_TAG MKBETAG('F', 'I', 'L', 'M')
 #define FDSC_TAG MKBETAG('F', 'D', 'S', 'C')
@@ -74,8 +75,7 @@ static int film_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int film_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int film_read_header(AVFormatContext *s)
 {
     FilmDemuxContext *film = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -196,8 +196,13 @@ static int film_read_header(AVFormatContext *s,
     if (!film->sample_table)
         return AVERROR(ENOMEM);
 
-    for(i=0; i<s->nb_streams; i++)
-        av_set_pts_info(s->streams[i], 33, 1, film->base_clock);
+    for (i = 0; i < s->nb_streams; i++) {
+        st = s->streams[i];
+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+            avpriv_set_pts_info(st, 33, 1, film->base_clock);
+        else
+            avpriv_set_pts_info(st, 64, 1, film->audio_samplerate);
+    }
 
     audio_frame_counter = 0;
     for (i = 0; i < film->sample_count; i++) {
@@ -212,8 +217,6 @@ static int film_read_header(AVFormatContext *s,
         if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
             film->sample_table[i].stream = film->audio_stream_index;
             film->sample_table[i].pts = audio_frame_counter;
-            film->sample_table[i].pts *= film->base_clock;
-            film->sample_table[i].pts /= film->audio_samplerate;
 
             if (film->audio_type == CODEC_ID_ADPCM_ADX)
                 audio_frame_counter += (film->sample_table[i].sample_size * 32 /