From 08ec828de9663e46fbfe8feef5c15253f841c687 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 16 Sep 2017 19:21:35 +0200
Subject: [PATCH] avcodec/vorbisenc: Fix mixed declaration and statements
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/vorbisenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index bf21a3b1ff5..a4ecd8f7547 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -1026,6 +1026,7 @@ static int apply_window_and_mdct(vorbis_enc_context *venc)
static AVFrame *spawn_empty_frame(AVCodecContext *avctx, int channels)
{
AVFrame *f = av_frame_alloc();
+ int ch;
if (!f)
return NULL;
@@ -1039,7 +1040,7 @@ static AVFrame *spawn_empty_frame(AVCodecContext *avctx, int channels)
return NULL;
}
- for (int ch = 0; ch < channels; ch++) {
+ for (ch = 0; ch < channels; ch++) {
size_t bps = av_get_bytes_per_sample(f->format);
memset(f->extended_data[ch], 0, bps * f->nb_samples);
}
@@ -1108,8 +1109,9 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if (!frame) {
if (venc->bufqueue.available * avctx->frame_size < frame_size) {
int frames_needed = (frame_size/avctx->frame_size) - venc->bufqueue.available;
+ int i;
- for (int i = 0; i < frames_needed; i++) {
+ for (i = 0; i < frames_needed; i++) {
AVFrame *empty = spawn_empty_frame(avctx, venc->channels);
if (!empty)
return AVERROR(ENOMEM);
--
GitLab