[FFmpeg-cvslog] segafilm: use the sample rate as the time base for audio streams

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Jan 11 11:07:40 2012 -0500| [4da374f8a9bc7cf790e6f5b30af3a30f0b777348] | committer: Justin Ruggles

segafilm: use the sample rate as the time base for audio streams

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4da374f8a9bc7cf790e6f5b30af3a30f0b777348
---

 libavformat/segafilm.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 83ba4f0..23cb3ed 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -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++)
-        avpriv_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 /