Changeset d0ef4b7

Timestamp:

Dec 31, 2018, 9:48:19 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn_org, feature/crepe_org

Children:

5010e61

Parents:

9bad2ba (diff), dc7362fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/cnn

File:

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

src/io/source_avcodec.c

@@ -620 +620 @@
 #ifdef HAVE_AVRESAMPLE
     avresample_close( s->avr );
+    av_free ( s->avr );
 #elif defined(HAVE_SWRESAMPLE)
     swr_close ( s->avr );
-#endif
-    av_free ( s->avr );
+    swr_free ( &s->avr );
+#endif
   }
   s->avr = NULL;