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

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-08 17:31:27 +01:00
parent 55feff57ce a2bc8c5601
commit 162f344971
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/movenc.c
View File

@@ -322,6 +322,7 @@ struct eac3_info {
} substream[1]; /* TODO: support 8 independent substreams */ } substream[1]; /* TODO: support 8 independent substreams */
}; };
#if CONFIG_AC3_PARSER
static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
{ {
GetBitContext gbc; GetBitContext gbc;
@@ -442,6 +443,7 @@ concatenate:
return pkt->size; return pkt->size;
} }
#endif
static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
{ {
@@ -4188,13 +4190,15 @@ 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 (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); size = handle_eac3(mov, pkt, trk);
if (size < 0) if (size < 0)
return size; return size;
else if (!size) else if (!size)
goto end; goto end;
avio_write(pb, pkt->data, size); avio_write(pb, pkt->data, size);
#endif
} else { } else {
avio_write(pb, pkt->data, size); avio_write(pb, pkt->data, size);
} }