* cehoyos/master: Fix standalone compilation of the mov muxer with --disable-optimizations.
Unified · Split
| @@ -322,6 +322,7 @@ struct eac3_info { · 321 unmodified lines | |||
| 322 | } substream[1]; /* TODO: support 8 independent substreams */ | 322 | } substream[1]; /* TODO: support 8 independent substreams */ |
| 323 | }; | 323 | }; |
| 324 | 324 | ||
| 325 | #if CONFIG_AC3_PARSER | ||
| 325 | static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) | 326 | static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) |
| 326 | { | 327 | { |
| 327 | GetBitContext gbc; | 328 | GetBitContext gbc; |
| @@ -442,6 +443,7 @@ concatenate: · 114 unmodified lines | |||
| 442 | 443 | ||
| 443 | return pkt->size; | 444 | return pkt->size; |
| 444 | } | 445 | } |
| 446 | #endif | ||
| 445 | 447 | ||
| 446 | static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) | 448 | static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) |
| 447 | { | 449 | { |
| @@ -4188,13 +4190,15 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 3740 unmodified lines | |||
| 4188 | } else { | 4190 | } else { |
| 4189 | size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL); | 4191 | size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL); |
| 4190 | } | 4192 | } |
| 4191 | } else if (CONFIG_AC3_PARSER && enc->codec_id == AV_CODEC_ID_EAC3) { | 4193 | #if CONFIG_AC3_PARSER |
| 4194 | } else if (enc->codec_id == AV_CODEC_ID_EAC3) { | ||
| 4192 | size = handle_eac3(mov, pkt, trk); | 4195 | size = handle_eac3(mov, pkt, trk); |
| 4193 | if (size < 0) | 4196 | if (size < 0) |
| 4194 | return size; | 4197 | return size; |
| 4195 | else if (!size) | 4198 | else if (!size) |
| 4196 | goto end; | 4199 | goto end; |
| 4197 | avio_write(pb, pkt->data, size); | 4200 | avio_write(pb, pkt->data, size); |
| 4201 | #endif | ||
| 4198 | } else { | 4202 | } else { |
| 4199 | avio_write(pb, pkt->data, size); | 4203 | avio_write(pb, pkt->data, size); |
| 4200 | } | 4204 | } |