aballier    14/10/11 10:22:49

  Added:                sox-14.4.1-ffmpeg24.patch
  Log:
  fix build with ffmpeg 2.4+, bug #520188
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with 
key 160F534A)

Revision  Changes    Path
1.1                  media-sound/sox/files/sox-14.4.1-ffmpeg24.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/files/sox-14.4.1-ffmpeg24.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/files/sox-14.4.1-ffmpeg24.patch?rev=1.1&content-type=text/plain

Index: sox-14.4.1-ffmpeg24.patch
===================================================================
Index: sox-14.4.1/src/ffmpeg.c
===================================================================
--- sox-14.4.1.orig/src/ffmpeg.c
+++ sox-14.4.1/src/ffmpeg.c
@@ -263,8 +263,12 @@ static int stopread(sox_format_t * ft)
   if (ffmpeg->audio_stream >= 0)
     stream_component_close(ffmpeg, ffmpeg->audio_stream);
   if (ffmpeg->ctxt) {
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
+    avformat_close_input(&ffmpeg->ctxt);
+#else
     av_close_input_file(ffmpeg->ctxt);
     ffmpeg->ctxt = NULL; /* safety */
+#endif
   }
 
   free(ffmpeg->audio_buf_raw);




Reply via email to