aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-01-09 11:05:33 +0200
committerMartin Storsjö <martin@martin.st>2012-01-25 12:15:41 +0200
commit3b5d4428acf6eab60410358a5dbf931a17300ecf (patch)
treec02b213598023eff6545fc6b1229875d32f7fc86 /libavformat
parent4ddd54dab40fd84391d1edaec319353f986119b0 (diff)
downloadffmpeg-3b5d4428acf6eab60410358a5dbf931a17300ecf.tar.gz
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@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index da110ddda0..95d92aa71c 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 */
}