diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:49 +0100 |
| commit | afb4bc3d291f4cc6b67b635305d30a097cb2a82d (patch) | |
| tree | abf13c6844cf4a0921b6fb91edd607717c883829 /libavformat | |
| parent | 91f359292a52b7acf3785ea4c399b20d8fbd24e5 (diff) | |
| parent | 61d36761efda663c5ce07a5ec13659431b08f3c2 (diff) | |
| download | ffmpeg-afb4bc3d291f4cc6b67b635305d30a097cb2a82d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1b851c03dd..08015b545c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -356,8 +356,7 @@ static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic else avio_w8(pb, 0x11); // flags (= Visualstream) - avio_w8(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits) - avio_wb16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB + avio_wb24(pb, track->enc->rc_buffer_size >> 3); // Buffersize DB avg_bitrate = compute_avg_bitrate(track); // maxbitrate (FIXME should be max rate in any 1 sec window) |