[FFmpeg-cvslog] libvorbis: remove unneeded e_o_s check

Justin Ruggles git at videolan.org
Thu Mar 1 03:20:23 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Tue Feb 28 21:02:22 2012 -0500| [1fe7c1be547b92ac9f0b7e6158d76b91eee170e2] | committer: Justin Ruggles

libvorbis: remove unneeded e_o_s check

vorbis_bitrate_flushpacket() does not return any packets that should not be
output in the bitstream.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fe7c1be547b92ac9f0b7e6158d76b91eee170e2
---

 libavcodec/libvorbis.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 6ae47cf..dba0892 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -271,10 +271,6 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, unsigned char *packets,
 
         /* add any available packets to the output packet buffer */
         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) {
                 av_log(avctx, AV_LOG_ERROR, "libvorbis: buffer overflow.");
                 return -1;



More information about the ffmpeg-cvslog mailing list