[FFmpeg-cvslog] Fix standalone compilation of the mov muxer with --disable-optimizations.
Carl Eugen Hoyos
git at videolan.org
Sun Feb 8 17:55:07 CET 2015
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Feb 8 15:48:26 2015 +0100| [a2bc8c56016d3854daae7e684c4bb00eaf5839cb] | committer: Carl Eugen Hoyos
Fix standalone compilation of the mov muxer with --disable-optimizations.
Reported-by: Bernhard Döbler
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2bc8c56016d3854daae7e684c4bb00eaf5839cb
---
libavformat/movenc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3af3a17..df70d57 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -322,6 +322,7 @@ struct eac3_info {
} substream[1]; /* TODO: support 8 independent substreams */
};
+#if CONFIG_AC3_PARSER
static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
{
GetBitContext gbc;
@@ -442,6 +443,7 @@ concatenate:
return pkt->size;
}
+#endif
static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
{
@@ -4188,13 +4190,15 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
} else {
size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);
}
- } else if (CONFIG_AC3_PARSER && enc->codec_id == AV_CODEC_ID_EAC3) {
+#if CONFIG_AC3_PARSER
+ } else if (enc->codec_id == AV_CODEC_ID_EAC3) {
size = handle_eac3(mov, pkt, trk);
if (size < 0)
return size;
else if (!size)
goto end;
avio_write(pb, pkt->data, size);
+#endif
} else {
avio_write(pb, pkt->data, size);
}
More information about the ffmpeg-cvslog
mailing list