diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-06-08 00:06:19 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-08 00:06:19 +0200 |
| commit | d3778972d854b72685b10e0b4afedcc1af6f5433 (patch) | |
| tree | d6ad3cac2ae4e698818160056b9e497a96016b1d | |
| parent | c8e9ea43d004be04e4a9a07736104d099a5bf1f9 (diff) | |
| download | ffmpeg-d3778972d854b72685b10e0b4afedcc1af6f5433.tar.gz | |
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
The AC-3 encoder unconditionally references some symbols from the E-AC-3
encoder; make those references conditional to fix linking.
| -rw-r--r-- | libavcodec/ac3enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 9e011af094..e8ccde514a 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -566,7 +566,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) } } - if (s->eac3) + if (CONFIG_EAC3_ENCODER && s->eac3) ff_eac3_set_cpl_states(s); #endif /* CONFIG_AC3ENC_FLOAT */ } @@ -1987,7 +1987,7 @@ static void output_frame(AC3EncodeContext *s, unsigned char *frame) init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE); - if (s->eac3) + if (CONFIG_EAC3_ENCODER && s->eac3) ff_eac3_output_frame_header(s); else ac3_output_frame_header(s); |