RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-06 15:21:15 +00:00
Code Issues Projects Releases Wiki Activity

Do not needlessly add 7 to put_buts_count before dividing by 8,

Browse Source 
flush_put_bits ensures it is divisible 8.

Originally committed as revision 20103 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-09-30 20:47:59 +00:00
parent f2ad907060
commit 5200b90147
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vorbis_enc.c
View File

@ -542,7 +542,7 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
put_bits(&pb, 1, 1); // framing put_bits(&pb, 1, 1); // framing
flush_put_bits(&pb); flush_put_bits(&pb);
hlens[0] = (put_bits_count(&pb) + 7) / 8; hlens[0] = put_bits_count(&pb) >> 3;
buffer_len -= hlens[0]; buffer_len -= hlens[0];
p += hlens[0]; p += hlens[0];
@ -555,7 +555,7 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
put_bits(&pb, 1, 1); // framing put_bits(&pb, 1, 1); // framing
flush_put_bits(&pb); flush_put_bits(&pb);
hlens[1] = (put_bits_count(&pb) + 7) / 8; hlens[1] = put_bits_count(&pb) >> 3;
buffer_len -= hlens[1]; buffer_len -= hlens[1];
p += hlens[1]; p += hlens[1];
@ -628,7 +628,7 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
put_bits(&pb, 1, 1); // framing put_bits(&pb, 1, 1); // framing
flush_put_bits(&pb); flush_put_bits(&pb);
hlens[2] = (put_bits_count(&pb) + 7) / 8; hlens[2] = put_bits_count(&pb) >> 3;
len = hlens[0] + hlens[1] + hlens[2]; len = hlens[0] + hlens[1] + hlens[2];
p = *out = av_mallocz(64 + len + len/255); p = *out = av_mallocz(64 + len + len/255);
@ -1023,7 +1023,7 @@ static int vorbis_encode_frame(AVCodecContext *avccontext,
avccontext->coded_frame->pts = venc->sample_count; avccontext->coded_frame->pts = venc->sample_count;
venc->sample_count += avccontext->frame_size; venc->sample_count += avccontext->frame_size;
flush_put_bits(&pb); flush_put_bits(&pb);
return (put_bits_count(&pb) + 7) / 8; return put_bits_count(&pb) >> 3;
} }