[FFmpeg-cvslog] Fix compilation with --disable-everything --enable-outdev=alsa.

Carl Eugen Hoyos git at videolan.org
Sun Sep 18 22:23:59 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Sep 18 22:22:45 2011 +0200| [4bc447a3c5ef4e69b54cc20857335e8dd5bca60c] | committer: Carl Eugen Hoyos

Fix compilation with --disable-everything --enable-outdev=alsa.

Bug found and analysed by skierpage.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bc447a3c5ef4e69b54cc20857335e8dd5bca60c
---

 libavdevice/alsa-audio-common.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
index 0943ab0..79faf88 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa-audio-common.c
@@ -319,7 +319,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;
 }



More information about the ffmpeg-cvslog mailing list