From c51838478cab37488883f49ce940c4a0f0b235ba Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 3 Jul 2012 20:36:44 -0700 Subject: amr: remove shift out of the AMR_BIT() macro. MSVC doesn't like the offsetof(..) >> 1 construct, it interprets it as a non-literal, thus causing use of this in static tables to fail compilation. --- libavcodec/amrwbdata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/amrwbdata.h') diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 5421c23afb..83a93e997a 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -82,7 +82,7 @@ typedef struct { } AMRWBFrame; /** The index of a frame parameter */ -#define AMR_BIT(field) (offsetof(AMRWBFrame, field) >> 1) +#define AMR_BIT(field) (offsetof(AMRWBFrame, field)) /** The index of a subframe-specific parameter */ #define AMR_OF(frame_num, variable) AMR_BIT(subframe[frame_num].variable) -- cgit v1.2.1