virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Allow mov musing if the ac3 parser was disabled.

Browse Source 
This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de
This commit is contained in:
Carl Eugen Hoyos
2014-12-09 21:12:54 +01:00
parent 6ef9d1b216
commit 01ab761b46
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -2435,7 +2435,7 @@ matroska_muxer_select="riffenc"
mmf_muxer_select="riffenc" mmf_muxer_select="riffenc"
mov_demuxer_select="riffdec" mov_demuxer_select="riffdec"
mov_demuxer_suggest="zlib" mov_demuxer_suggest="zlib"
mov_muxer_select="riffenc rtpenc_chain ac3_parser" mov_muxer_select="riffenc rtpenc_chain"
mp3_demuxer_select="mpegaudio_parser" mp3_demuxer_select="mpegaudio_parser"
mp4_muxer_select="mov_muxer" mp4_muxer_select="mov_muxer"
mpegts_muxer_select="adts_muxer latm_muxer" mpegts_muxer_select="adts_muxer latm_muxer"

2
libavformat/movenc.c
View File

@@ -4009,7 +4009,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
} else { } else {
size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL); 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); size = handle_eac3(mov, pkt, trk);
if (size < 0) if (size < 0)
return size; return size;