Changeset c3e98d7 for src

Timestamp:

Sep 16, 2017, 5:39:08 PM (7 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

Children:

38a965e, 799a940

Parents:

930bfec

Message:

src/io/source_avcodec.c: improve error message, prevent un-opened bracket

File:

• src/io/source_avcodec.c (modified) (1 diff)

src/io/source_avcodec.c

@@ -314 +314 @@
     //av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_FLTP,      0);
 #ifdef HAVE_AVRESAMPLE
-    if ( ( err = avresample_open(avr) ) < 0) {
-#elif defined(HAVE_SWRESAMPLE)
-    if ( ( err = swr_init(avr) ) < 0) {
+    if ( ( err = avresample_open(avr) ) < 0)
+#elif defined(HAVE_SWRESAMPLE)
+    if ( ( err = swr_init(avr) ) < 0)
 #endif /* HAVE_AVRESAMPLE || HAVE_SWRESAMPLE */
+    {
       char errorstr[256];
       av_strerror (err, errorstr, sizeof(errorstr));
-      AUBIO_ERR("source_avcodec: Could not open AVAudioResampleContext for %s (%s)\n",
+      AUBIO_ERR("source_avcodec: Could not open resampling context for %s (%s)\n",
           s->path, errorstr);
-      //goto beach;
       return;
     }