ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Tue Dec 9 21:12:54 2014 +0100| [01ab761b46c5b6021795f9e8bb8f8fa04843a3e0] | committer: Carl Eugen Hoyos
Allow mov musing if the ac3 parser was disabled. This reverts 8091fe30. Reported and tested by Takashi, ffmpeg-list dubistmeinheld de > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01ab761b46c5b6021795f9e8bb8f8fa04843a3e0 --- configure | 2 +- libavformat/movenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8006f3b..c510ee4 100755 --- 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" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2321748..9445417 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
