From: Paul Brossier <piem@piem.org>
Date: Mon, 29 Oct 2018 22:47:29 +0000 (+0100)
Subject: Merge branch 'feature/wrapavcodec'
X-Git-Tag: 0.4.8~92^2~7
X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=cc3f129eaff938be0be26b15a8bb61106030cbe2

Merge branch 'feature/wrapavcodec'
---

cc3f129eaff938be0be26b15a8bb61106030cbe2
diff --cc src/io/source_avcodec.c
index 28039902,ebb9ba5d..f0be6746
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@@ -430,12 -448,10 +448,12 @@@ void aubio_source_avcodec_readframe(aub
  #if LIBAVUTIL_VERSION_MAJOR > 52
    if (avFrame->channels != (sint_t)s->input_channels) {
      AUBIO_WRN ("source_avcodec: trying to read from %d channel(s),"
-         "but configured for %d; is '%s' corrupt?\n", avFrame->channels,
-         s->input_channels, s->path);
+         "but configured for %d; is '%s' corrupt?\n",
+         avFrame->channels, s->input_channels, s->path);
      goto beach;
    }
 +#else
 +#warning "avutil < 53 is deprecated, crashes might occur on corrupt files"
  #endif
  
  #ifdef HAVE_AVRESAMPLE