Merge remote-tracking branch 'dwbuiten/master'

[ffmpeg] / libavcodec / vorbisenc.c

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index b7d816dc639e69a8b83e30d4f3b5f56de08b0cb0..7a053c2acce8198d19453dd445280a13c8bd1e30 100644 (file)
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -340,7 +340,8 @@ static int create_vorbis_context(vorbis_enc_context *venc,
         };
         fc->list[i].x = a[i - 2];
     }
-    ff_vorbis_ready_floor1_list(fc->list, fc->values);
+    if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values))
+        return AVERROR_BUG;
 
     venc->nresidues = 1;
     venc->residues  = av_malloc(sizeof(vorbis_enc_residue) * venc->nresidues);