OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8365c1a
)
avcodec/opusenc: Add () protecting macro arguments
author
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 16 Feb 2017 12:24:11 +0000
(13:24 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 16 Feb 2017 12:24:11 +0000
(13:24 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/opusenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/opusenc.c
b/libavcodec/opusenc.c
index
1a829ed
..
b774e28
100644
(file)
--- a/
libavcodec/opusenc.c
+++ b/
libavcodec/opusenc.c
@@
-40,9
+40,9
@@
/* 120 ms / 2.5 ms = 48 frames (extremely improbable, but the encoder'll work) */
#define OPUS_MAX_FRAMES_PER_PACKET 48
-#define OPUS_BLOCK_SIZE(x) (2 * 15 * (1 << (
x
+ 2)))
+#define OPUS_BLOCK_SIZE(x) (2 * 15 * (1 << (
(x)
+ 2)))
-#define OPUS_SAMPLES_TO_BLOCK_SIZE(x) (ff_log2(
x
/ (2 * 15)) - 2)
+#define OPUS_SAMPLES_TO_BLOCK_SIZE(x) (ff_log2(
(x)
/ (2 * 15)) - 2)
typedef struct OpusEncOptions {
float max_delay_ms;