[SCM] libav/experimental: Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:09:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 964ff35445a7368fbb1ee594c34357952ade4ead
Author: Alex Beregszaszi <alex at rtfs.hu>
Date:   Thu Nov 15 23:53:19 2007 +0000

    Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.
    
    Originally committed as revision 11042 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 3a5f5ec..2adc303 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -330,7 +330,7 @@ AVOutputFormat flv_muxer = {
 #ifdef CONFIG_LIBMP3LAME
     CODEC_ID_MP3,
 #else // CONFIG_LIBMP3LAME
-    CODEC_ID_NONE,
+    CODEC_ID_ADPCM_SWF,
 #endif // CONFIG_LIBMP3LAME
     CODEC_ID_FLV1,
     flv_write_header,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list