RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvorbis: remove unneeded e_o_s check 

vorbis_bitrate_flushpacket() does not return any packets that should not be
output in the bitstream.
This commit is contained in:
Justin Ruggles 2012-02-28 21:02:22 -05:00
parent 94025d8a99
commit 1fe7c1be54
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libvorbis.c
View File

@ -271,10 +271,6 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, unsigned char *packets,
/* add any available packets to the output packet buffer */ /* add any available packets to the output packet buffer */
while ((ret = vorbis_bitrate_flushpacket(&s->vd, &op)) == 1) { while ((ret = vorbis_bitrate_flushpacket(&s->vd, &op)) == 1) {
/* i'd love to say the following line is a hack, but sadly it's
* not, apparently the end of stream decision is in libogg. */
if (op.bytes == 1 && op.e_o_s)
continue;
if (s->buffer_index + sizeof(ogg_packet) + op.bytes > BUFFER_SIZE) { if (s->buffer_index + sizeof(ogg_packet) + op.bytes > BUFFER_SIZE) {
av_log(avctx, AV_LOG_ERROR, "libvorbis: buffer overflow."); av_log(avctx, AV_LOG_ERROR, "libvorbis: buffer overflow.");
return -1; return -1;