You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
953 B
29 lines
953 B
Fix building with C++14, which errors out due to narrowing conversions.
|
|
See also: https://bugs.gentoo.org/show_bug.cgi?id=594684
|
|
|
|
--- a/libs/huffmantable.cc
|
|
+++ b/libs/huffmantable.cc
|
|
@@ -550,11 +550,11 @@
|
|
|
|
const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
|
|
{
|
|
- { 0, 0-1, 0-1, 0, 0, htd33},
|
|
+ { 0, (unsigned int)(0-1), (unsigned int)(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 int)(0-1), (unsigned int)(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},
|
|
@@ -564,7 +564,7 @@
|
|
{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 int)(0-1), (unsigned int)(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},
|