[FFmpeg-cvslog] movenc: Write the sample rate instead of time scale in the stsd atom

Martin Storsjö git at videolan.org
Thu Jan 26 03:20:20 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jan  9 11:05:33 2012 +0200| [3b5d4428acf6eab60410358a5dbf931a17300ecf] | committer: Martin Storsjö

movenc: Write the sample rate instead of time scale in the stsd atom

For ismv/isma, the time scale might not be the same as the sample
rate.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/movenc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index da110dd..95d92aa 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -478,7 +478,7 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
         avio_wb16(pb, 0);
         avio_wb32(pb, 0x00010000);
         avio_wb32(pb, 72);
-        avio_wb64(pb, av_double2int(track->timescale));
+        avio_wb64(pb, av_double2int(track->enc->sample_rate));
         avio_wb32(pb, track->enc->channels);
         avio_wb32(pb, 0x7F000000);
         avio_wb32(pb, av_get_bits_per_sample(track->enc->codec_id));
@@ -492,7 +492,7 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
         avio_wb16(pb, 0);
 
         avio_wb16(pb, 0); /* packet size (= 0) */
-        avio_wb16(pb, track->timescale); /* Time scale */
+        avio_wb16(pb, track->enc->sample_rate);
         avio_wb16(pb, 0); /* Reserved */
     }
 



More information about the ffmpeg-cvslog mailing list