From patchwork Wed Aug 28 17:26:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14760 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ED15244A664 for ; Wed, 28 Aug 2019 20:29:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C80236803A0; Wed, 28 Aug 2019 20:29:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95AEF6802F5 for ; Wed, 28 Aug 2019 20:29:00 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1i31ki-0008r5-2c for ffmpeg-devel@ffmpeg.org; Wed, 28 Aug 2019 19:29:00 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 31jkijFcqwlys31jkiRviT; Wed, 28 Aug 2019 19:28:00 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=uAOAg17lJq8Cb1Z1rvAA:9 a=pHzHmUro8NiASowvMSCR:22 a=xoEH_sTeL_Rfw54TyV31:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Aug 2019 19:26:53 +0200 Message-Id: <20190828172653.20031-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190828172653.20031-1-michael@niedermayer.cc> References: <20190828172653.20031-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGVbae2NmGnViDnkT+SQ/VexxAxuKpx7D+7yVF0yBNj9E8uc04f22oJ6qwnHRz1qYYumYXAdvk0CQbBTnQUFvn4R3cx8VGahpmWgreo02dCJ34tRa2uv i1WmzNC7uMHr1ABxi6L1KLQZs8xgnlhoG/Sgc5eX9glqpMaF1OGS4Hzs Subject: [FFmpeg-devel] [PATCH 5/5] doc/examples/decode_audio: Fix "warning: ISO C90 forbids mixed declarations and code" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- doc/examples/decode_audio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c index 6f589b9878..6c2a8ed550 100644 --- a/doc/examples/decode_audio.c +++ b/doc/examples/decode_audio.c @@ -115,6 +115,9 @@ int main(int argc, char **argv) size_t data_size; AVPacket *pkt; AVFrame *decoded_frame = NULL; + enum AVSampleFormat sfmt; + int n_channels = 0; + const char *fmt; if (argc <= 2) { fprintf(stderr, "Usage: %s \n", argv[0]); @@ -202,9 +205,7 @@ int main(int argc, char **argv) decode(c, pkt, decoded_frame, outfile); /* print output pcm infomations, because there have no metadata of pcm */ - enum AVSampleFormat sfmt = c->sample_fmt; - int n_channels = 0; - const char *fmt; + sfmt = c->sample_fmt; if (av_sample_fmt_is_planar(sfmt)) { const char *packed = av_get_sample_fmt_name(sfmt);