[FFmpeg-cvslog] avcodec/opusenc: Add () protecting macro arguments

Michael Niedermayer git at videolan.org
Thu Feb 16 14:48:21 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Feb 16 13:24:11 2017 +0100| [1fa8884aeb942d934e30cc8e8a419ef8d458f7ea] | committer: Michael Niedermayer

avcodec/opusenc: Add () protecting macro arguments

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index 1a829ed..b774e28 100644
--- 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;



More information about the ffmpeg-cvslog mailing list