[FFmpeg-cvslog] ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.

Diego Biurrun git at videolan.org
Wed Jun 8 05:31:36 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Jun  8 00:06:19 2011 +0200| [d3778972d854b72685b10e0b4afedcc1af6f5433] | committer: Diego Biurrun

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3778972d854b72685b10e0b4afedcc1af6f5433
---

 libavcodec/ac3enc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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);



More information about the ffmpeg-cvslog mailing list