Skip to content

F
ffmpeg
Commit a213e57c authored by Juanjo's avatar Juanjo Committed by Michael Niedermayer
Browse files
Options

lavf/riffenc: Set correct block align for mp2. 

Rounding by Michael.

Fixes ticket #4565.
parent 3b4e694e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavformat/riffenc.c
View file @ a213e57c
......@@ -103,7 +103,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags)
}
if (enc->codec_id == AV_CODEC_ID_MP2) {
blkalign = frame_size;
blkalign = (144 * enc->bit_rate - 1)/enc->sample_rate + 1;
} else if (enc->codec_id == AV_CODEC_ID_MP3) {
blkalign = 576 * (enc->sample_rate <= (24000 + 32000)/2 ? 1 : 2);
} else if (enc->codec_id == AV_CODEC_ID_AC3) {
......
tests/ref/lavf/asf
View file @ a213e57c
1a8716a0358b8123c02557dfdf6c259b *./tests/data/lavf/lavf.asf
76f131a5426f0ba5fc7409d1a1bbfdd7 *./tests/data/lavf/lavf.asf
333585 ./tests/data/lavf/lavf.asf
./tests/data/lavf/lavf.asf CRC=0xf6340a10
tests/ref/lavf/avi
View file @ a213e57c
07a29d329e7f07a4fd682145c3771995 *./tests/data/lavf/lavf.avi
ab696052289d8dfea193e4cf94a94a6f *./tests/data/lavf/lavf.avi
330814 ./tests/data/lavf/lavf.avi
./tests/data/lavf/lavf.avi CRC=0xec6c3c68
tests/ref/lavf/wtv
View file @ a213e57c
b74b14ee41830aed90380bf6252dcfdb *./tests/data/lavf/lavf.wtv
c5328b1c3e5fe70468c3f587c34ffd82 *./tests/data/lavf/lavf.wtv
413696 ./tests/data/lavf/lavf.wtv
./tests/data/lavf/lavf.wtv CRC=0x71287e25
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment