aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-07-03 20:36:44 -0700
committerRonald S. Bultje <rsbultje@gmail.com>2012-07-04 07:46:53 -0700
commitc51838478cab37488883f49ce940c4a0f0b235ba (patch)
tree22ef8d3635de9ba1507ff05f723c50a848794ec1
parent723b266d7285776e5134a42503e468447940decb (diff)
downloadffmpeg-c51838478cab37488883f49ce940c4a0f0b235ba.tar.gz
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.
-rw-r--r--libavcodec/amr.h2
-rw-r--r--libavcodec/amrnbdata.h2
-rw-r--r--libavcodec/amrwbdata.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/amr.h b/libavcodec/amr.h
index ae6e4d1490..9498d57a9b 100644
--- a/libavcodec/amr.h
+++ b/libavcodec/amr.h
@@ -61,7 +61,7 @@ static inline void ff_amr_bit_reorder(uint16_t *out, int size,
field <<= 1;
field |= data[bit >> 3] >> (bit & 7) & 1;
}
- out[field_offset] = field;
+ out[field_offset >> 1] = field;
}
}
diff --git a/libavcodec/amrnbdata.h b/libavcodec/amrnbdata.h
index 26ff7fb40e..c2e2f8a5e5 100644
--- a/libavcodec/amrnbdata.h
+++ b/libavcodec/amrnbdata.h
@@ -71,7 +71,7 @@ typedef struct {
} AMRNBFrame;
/** The index of a frame parameter */
-#define AMR_BIT(field) (offsetof(AMRNBFrame, field) >> 1)
+#define AMR_BIT(field) (offsetof(AMRNBFrame, field))
/** The index of a subframe-specific parameter */
#define AMR_OF(frame_num, variable) AMR_BIT(subframe[frame_num].variable)
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)