[FFmpeg-cvslog] vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check

Justin Ruggles git at videolan.org
Fri Nov 11 02:53:06 CET 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Oct 30 18:41:00 2011 -0400| [41899b9acb92dd59a0eca0f86cac4c49afbc1b79] | committer: Justin Ruggles

vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check

The user could provide a larger buffer, which is already checked separately
before writing output.

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

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

diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index e79feb9..b202249 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -936,12 +936,6 @@ static int vorbis_parse_id_hdr(vorbis_context *vc)
         av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
         return AVERROR_INVALIDDATA;
     }
-    // output format int16
-    if (vc->blocksize[1] / 2 * vc->audio_channels * 2 > AVCODEC_MAX_AUDIO_FRAME_SIZE) {
-        av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes "
-               "output packets too large.\n");
-        return AVERROR_PATCHWELCOME;
-    }
     vc->win[0] = ff_vorbis_vwin[bl0 - 6];
     vc->win[1] = ff_vorbis_vwin[bl1 - 6];
 



More information about the ffmpeg-cvslog mailing list