Allow mov musing if the ac3 parser was disabled.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 9 Dec 2014 20:12:54 +0000 (21:12 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 9 Dec 2014 21:12:53 +0000 (22:12 +0100)
This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

configure
libavformat/movenc.c

index 8006f3b..c510ee4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2435,7 +2435,7 @@ matroska_muxer_select="riffenc"
 mmf_muxer_select="riffenc"
 mov_demuxer_select="riffdec"
 mov_demuxer_suggest="zlib"
-mov_muxer_select="riffenc rtpenc_chain ac3_parser"
+mov_muxer_select="riffenc rtpenc_chain"
 mp3_demuxer_select="mpegaudio_parser"
 mp4_muxer_select="mov_muxer"
 mpegts_muxer_select="adts_muxer latm_muxer"
index 2321748..9445417 100644 (file)
@@ -4009,7 +4009,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
         } else {
             size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);
         }
-    } else if (enc->codec_id == AV_CODEC_ID_EAC3) {
+    } else if (CONFIG_AC3_PARSER && enc->codec_id == AV_CODEC_ID_EAC3) {
         size = handle_eac3(mov, pkt, trk);
         if (size < 0)
             return size;