[SCM] libav/experimental: sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 302c389e4f825395e2580d6303ad26eb6ac0dffa
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Sep 4 21:04:25 2005 +0000

    sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
    
    Originally committed as revision 4558 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 72f3ee3..e050ddd 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -781,7 +781,7 @@ static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     AVStream *st = c->fc->streams[c->fc->nb_streams-1];
-    //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
+    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     int entries, frames_per_sample;
     uint32_t format;
     uint8_t codec_name[32];
@@ -1071,6 +1071,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                 st->codec->bits_per_sample = get_be16(pb); /* bits per sample */
                 get_be32(pb);
                 st->codec->sample_rate = get_be16(pb); /* sample rate, not always correct */
+                if(st->codec->sample_rate == 1) //nonsese rate? -> ignore
+                    st->codec->sample_rate= 0;
+
                 get_be16(pb);
                 c->mp4=1;
                 
@@ -1196,6 +1199,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             }
         }
     }
+    
+    if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) {
+        st->codec->sample_rate= sc->time_scale;
+    }
 
     return 0;
 }

-- 
Libav/FFmpeg packaging