Changes in src/io/source_avcodec.c [3e944fe4:ba67cb6]

File:

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

src/io/source_avcodec.c

@@ -357 +357 @@
       av_strerror (err, errorstr, sizeof(errorstr));
       AUBIO_ERR("source_avcodec: could not read frame in %s (%s)\n", s->path, errorstr);
-      s->eof = 1;
       goto beach;
     }
@@ -375 +374 @@
   if (ret < 0) {
     if (ret == AVERROR(EAGAIN)) {
-      //AUBIO_WRN("source_avcodec: output is not available right now - user must try to send new input\n");
-      goto beach;
+      AUBIO_WRN("source_avcodec: output is not available right now - user must try to send new input\n");
     } else if (ret == AVERROR_EOF) {
       AUBIO_WRN("source_avcodec: the decoder has been fully flushed, and there will be no more output frames\n");
@@ -566 +564 @@
   s->avr = NULL;
   if (s->avCodecCtx != NULL) {
-#ifndef HAVE_AUBIO_LIBAVCODEC_DEPRECATED
-    avcodec_free_context( &s->avCodecCtx );
-#else
     avcodec_close ( s->avCodecCtx );
-#endif
   }
   s->avCodecCtx = NULL;