Changes in src/io/source_avcodec.c [c3e98d7:58fe197]

File:

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

src/io/source_avcodec.c

@@ -59 +59 @@
 #include "source_avcodec.h"
 
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
 #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
+#else
+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+#endif
 
 struct _aubio_source_avcodec_t {
@@ -271 +275 @@
   // default to mono output
   aubio_source_avcodec_reset_resampler(s, 0);
+
+  if (s->avr == NULL) goto beach;
 
   s->eof = 0;
@@ -419 +425 @@
     goto beach;
   }
+
+#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);
+    goto beach;
+  }
+#endif
 
 #ifdef HAVE_AVRESAMPLE