Changeset de23e58 for src/io

Timestamp:

Apr 10, 2017, 2:53:00 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

5bd9a2b

Parents:

50f39f5

Message:

src/io/source_avcodec.c: more fixes to declare before assigning

File:

• src/io/source_avcodec.c (modified) (3 diffs)

src/io/source_avcodec.c

@@ -114 +114 @@
   AVCodec *codec;
   AVFrame *avFrame = s->avFrame;
+#if FF_API_LAVF_AVCTX
+  AVCodecParameters *codecpar;
+#endif
   uint_t i;
   sint_t selected_stream = -1;
@@ -195 +198 @@
 
 #if FF_API_LAVF_AVCTX
-  AVCodecParameters *codecpar = avFormatCtx->streams[selected_stream]->codecpar;
+  codecpar = avFormatCtx->streams[selected_stream]->codecpar;
   if (codecpar == NULL) {
     AUBIO_ERR("source_avcodec: Could not find decoder for %s", s->path);
@@ -211 +214 @@
 #else
   avCodecCtx = avFormatCtx->streams[selected_stream]->codec;
-  AVCodec *codec = avcodec_find_decoder(avCodecCtx->codec_id);
+  codec = avcodec_find_decoder(avCodecCtx->codec_id);
 #endif
   if (codec == NULL) {