projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
437c11c
)
g726: wrap the decoder functions with a CONFIG_ADPCM_G726_DECODER check
author
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 28 Oct 2011 00:51:40 +0000
(20:51 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 2 Nov 2011 01:23:04 +0000
(21:23 -0400)
libavcodec/g726.c
patch
|
blob
|
blame
|
history
diff --git
a/libavcodec/g726.c
b/libavcodec/g726.c
index
2a60a92
..
14ce545
100644
(file)
--- a/
libavcodec/g726.c
+++ b/
libavcodec/g726.c
@@
-380,6
+380,7
@@
AVCodec ff_adpcm_g726_encoder = {
};
#endif
+#if CONFIG_ADPCM_G726_DECODER
static av_cold int g726_decode_init(AVCodecContext *avctx)
{
G726Context* c = avctx->priv_data;
@@
-448,3
+449,4
@@
AVCodec ff_adpcm_g726_decoder = {
.decode = g726_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
};
+#endif