summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2016-09-03 16:25:22 +0200
committerSlávek Banko <[email protected]>2016-09-03 16:25:33 +0200
commitcabe21759aefddc261a8ed198a245750e9e55698 (patch)
treecc2a5db39ddf7bc7f1b89d60526cf3a113a78995
parentfe23e76185ded7ed968bc7c0887a989f50a63dd4 (diff)
downloadtdemultimedia-cabe21759aefddc261a8ed198a245750e9e55698.tar.gz
tdemultimedia-cabe21759aefddc261a8ed198a245750e9e55698.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit cf805bdafd40c59520704c8b72d32d61ddaf1c5d)
-rw-r--r--mpeglib/lib/splay/huffmantable.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/mpeglib/lib/splay/huffmantable.cpp b/mpeglib/lib/splay/huffmantable.cpp
index a1fe20e5..223e6069 100644
--- a/mpeglib/lib/splay/huffmantable.cpp
+++ b/mpeglib/lib/splay/huffmantable.cpp
@@ -547,11 +547,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, 1},{ 2, 1},{ 0, 0},{ 0, 1},
const ATTR_ALIGN(64) HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
{
- { 0, 0-1, 0-1, 0, 0, htd33},
+ { 0, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33},
{ 1, 2-1, 2-1, 0, 7,htd01},
{ 2, 3-1, 3-1, 0, 17,htd02},
{ 3, 3-1, 3-1, 0, 17,htd03},
- { 4, 0-1, 0-1, 0, 0, htd33},
+ { 4, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33},
{ 5, 4-1, 4-1, 0, 31,htd05},
{ 6, 4-1, 4-1, 0, 31,htd06},
{ 7, 6-1, 6-1, 0, 71,htd07},
@@ -561,7 +561,7 @@ const ATTR_ALIGN(64) HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
{11, 8-1, 8-1, 0,127,htd11},
{12, 8-1, 8-1, 0,127,htd12},
{13,16-1,16-1, 0,511,htd13},
- {14, 0-1, 0-1, 0, 0, htd33},
+ {14, (unsigned)(0-1), (unsigned)(0-1), 0, 0, htd33},
{15,16-1,16-1, 0,511,htd15},
{16,16-1,16-1, 1,511,htd16},
{17,16-1,16-1, 2,511,htd16},