projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c8e9ea4
)
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
author
Diego Biurrun
<diego@biurrun.de>
Tue, 7 Jun 2011 22:06:19 +0000
(
00:06
+0200)
committer
Diego Biurrun
<diego@biurrun.de>
Tue, 7 Jun 2011 22:06:19 +0000
(
00:06
+0200)
The AC-3 encoder unconditionally references some symbols from the E-AC-3
encoder; make those references conditional to fix linking.
libavcodec/ac3enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/ac3enc.c
b/libavcodec/ac3enc.c
index
9e011af
..
e8ccde5
100644
(file)
--- 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);