[SCM] libav/experimental: set correct timebase

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:41:55 UTC 2013


The following commit has been merged in the experimental branch:
commit 595bf4ef63fc9a4d863b5ecc53605640301f2273
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Oct 18 09:43:39 2004 +0000

    set correct timebase
    
    Originally committed as revision 3607 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/au.c b/libavformat/au.c
index 6ce326f..1721902 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -148,6 +148,7 @@ static int au_read_header(AVFormatContext *s,
     st->codec.codec_id = codec;
     st->codec.channels = channels;
     st->codec.sample_rate = rate;
+    av_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
diff --git a/libavformat/raw.c b/libavformat/raw.c
index 23ba500..2ae7449 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -60,6 +60,7 @@ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
         case CODEC_TYPE_AUDIO:
             st->codec.sample_rate = ap->sample_rate;
             st->codec.channels = ap->channels;
+            av_set_pts_info(st, 64, 1, st->codec.sample_rate);
             break;
         case CODEC_TYPE_VIDEO:
             st->codec.frame_rate      = ap->frame_rate;
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 2631310..038feea 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -117,7 +117,8 @@ static int sol_read_header(AVFormatContext *s,
     st->codec.codec_tag = id;
     st->codec.codec_id = codec;
     st->codec.channels = channels;
-    st->codec.sample_rate = rate;
+    st->codec.sample_rate = rate;    
+    av_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
diff --git a/libavformat/wav.c b/libavformat/wav.c
index a85e9d6..2d28b8f 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -301,7 +301,9 @@ static int wav_read_header(AVFormatContext *s,
 
     get_wav_header(pb, &st->codec, size);
     st->need_parsing = 1;
-    
+
+    av_set_pts_info(st, 64, 1, st->codec.sample_rate);
+
     size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
     if (size < 0)
         return -1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list