Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / alsa-audio-common.c

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index 0943ab030ab693ea701eafb62f95836fe1e8a113..1ed7b6ed5e5d024ba0084b71e64ca9058f97e648 100644 (file)
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -31,6 +31,7 @@
 #include <alsa/asoundlib.h>
 #include "avdevice.h"
 #include "libavutil/avassert.h"
+#include "libavutil/audioconvert.h"
 
 #include "alsa-audio.h"
 
@@ -319,7 +320,8 @@ av_cold int ff_alsa_close(AVFormatContext *s1)
     AlsaData *s = s1->priv_data;
 
     av_freep(&s->reorder_buf);
-    ff_timefilter_destroy(s->timefilter);
+    if (CONFIG_ALSA_INDEV)
+        ff_timefilter_destroy(s->timefilter);
     snd_pcm_close(s->h);
     return 0;
 }