summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-12-09 21:12:54 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-12-09 22:12:53 +0100
commit01ab761b46c5b6021795f9e8bb8f8fa04843a3e0 (patch)
treebd2d8cc9aacda4aa0e2710254b43b6703b537cb3 /libavformat
parent6ef9d1b21629f005c319dfb2010154fa8e540f73 (diff)
Allow mov musing if the ac3 parser was disabled.
This reverts 8091fe30. Reported and tested by Takashi, ffmpeg-list dubistmeinheld de
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2321748bf3..944541762a 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;