aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:11:37 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:11:43 +0100
commit2c3e38f44fd224790bdb8fa789c9d85dc6dbd659 (patch)
treefe7f9f5a93c236b4197b62a472eb6c8c8d33436c /libavcodec
parente445b80c741cdfca81755d71290601dbe8d411c5 (diff)
parent42244ce07a1f4f5108ae86d50fe72db785d483ed (diff)
downloadffmpeg-2c3e38f44fd224790bdb8fa789c9d85dc6dbd659.tar.gz
Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'
* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed': intrax8: Move a comment to the place it corresponds Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/intrax8.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 036158cf0f..3d34cba294 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -151,11 +151,11 @@ static inline int x8_get_orient_vlc(IntraX8Context * w){
return get_vlc2(&s->gb, w->j_orient_vlc->table, OR_VLC_BITS, OR_VLC_MTD);
}
-#define extra_bits(eb) (eb)
-#define extra_run (0xFF<<8)
-#define extra_level (0x00<<8)
-#define run_offset(r) ((r)<<16)
-#define level_offset(l) ((l)<<24)
+#define extra_bits(eb) (eb) // 3 bits
+#define extra_run (0xFF << 8) // 1 bit
+#define extra_level (0x00 << 8) // 1 bit
+#define run_offset(r) ((r) << 16) // 6 bits
+#define level_offset(l) ((l) << 24) // 5 bits
static const uint32_t ac_decode_table[]={
/*46*/ extra_bits(3) | extra_run | run_offset(16) | level_offset( 0),
/*47*/ extra_bits(3) | extra_run | run_offset(24) | level_offset( 0),
@@ -192,7 +192,6 @@ static const uint32_t ac_decode_table[]={
/*71*/ extra_bits(2) | extra_level | run_offset( 1) | level_offset( 3),
/*72*/ extra_bits(3) | extra_level | run_offset( 1) | level_offset( 7),
};
-//extra_bits = 3bits; extra_run/level = 1 bit; run_offset = 6bits; level_offset = 5 bits;
#undef extra_bits
#undef extra_run
#undef extra_level