From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 7 Jun 2011 22:06:19 +0000 (+0200)
Subject: ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
X-Git-Tag: v0.7rc1~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3778972d854b72685b10e0b4afedcc1af6f5433;p=platform%2Fupstream%2Flibav.git

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.
---

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 9e011af..e8ccde5 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);