mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-30 08:50:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: fix __inline is not at beginning of declaration [-Wold-style-declaration]

Browse Source 
Origin commit data
------------------
Branch: master
Commit: cd9c052a67
Author: max_10 <max_10@gmx.de>
Date: 2019-11-11 (Mon, 11 Nov 2019)

Origin message was:
------------------
- libeplayer3: fix __inline is not at beginning of declaration [-Wold-style-declaration]

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-11-11 23:15:48 +01:00
committed by vanhofen
parent f11fb62a52
commit 4893dd5d20
5 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libeplayer3/external/flv2mpeg4/src/flvdecoder.c vendored
View File

@@ -174,7 +174,7 @@ static const VLCtab vlc_table_mv[] = //mv_vlc: table_size=538 table_allocated=10
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static int __inline decode_DC(BR *p)
static inline int decode_DC(BR *p)
{
int level = get_bits(p, 8);
if ((level & 0x7f) == 0)
@@ -188,7 +188,7 @@ static int __inline decode_DC(BR *p)
return level;
}
static int __inline decode_AC(BR *p, BLOCK *block, int escape_type, int i)
static inline int decode_AC(BR *p, BLOCK *block, int escape_type, int i)
{
int code, run, level, last, sign;
@@ -253,7 +253,7 @@ static int __inline decode_AC(BR *p, BLOCK *block, int escape_type, int i)
return 0;
}
static int __inline decode_intra_block(BR *p, BLOCK *block, int escape_type, int coded)
static inline int decode_intra_block(BR *p, BLOCK *block, int escape_type, int coded)
{
int level = decode_DC(p);
if (level < 0)
@@ -274,7 +274,7 @@ static int __inline decode_intra_block(BR *p, BLOCK *block, int escape_type, int
return 0;
}
static int __inline decode_inter_block(BR *p, BLOCK *block, int escape_type, int coded)
static inline int decode_inter_block(BR *p, BLOCK *block, int escape_type, int coded)
{
block->last_index = -1;
@@ -287,7 +287,7 @@ static int __inline decode_inter_block(BR *p, BLOCK *block, int escape_type, int
return 0;
}
static int __inline get_intra_MCBPC(BR *br)
static inline int get_intra_MCBPC(BR *br)
{
int cbpc;
do
@@ -299,7 +299,7 @@ static int __inline get_intra_MCBPC(BR *br)
return cbpc;
}
static int __inline get_inter_MCBPC(BR *br)
static inline int get_inter_MCBPC(BR *br)
{
int cbpc;
do
@@ -316,18 +316,18 @@ static int __inline get_inter_MCBPC(BR *br)
return cbpc;
}
static int __inline get_cbpy(BR *br)
static inline int get_cbpy(BR *br)
{
return get_vlc(br, vlc_table_cbpy, 6, 1);
}
static int __inline decode_dquant(BR *p)
static inline int decode_dquant(BR *p)
{
static const int table[4] = { -1, -2, 1, 2 };
return table[get_bits(p, 2)];
}
static int __inline decode_motion(BR *br, VLCDEC *vlcdec)
static inline int decode_motion(BR *br, VLCDEC *vlcdec)
{
int tmp;
int code = get_vlcdec(br, vlc_table_mv, 9, 2, vlcdec);
@@ -353,7 +353,7 @@ static int __inline decode_motion(BR *br, VLCDEC *vlcdec)
return 0;
}
static int __inline decode_intra_mb_internal(BR *p, MICROBLOCK *mb, int escape_type, int qscale, int cbpc, int dquant)
static inline int decode_intra_mb_internal(BR *p, MICROBLOCK *mb, int escape_type, int qscale, int cbpc, int dquant)
{
int cbpy, cbp;
int i;
@@ -382,7 +382,7 @@ static int __inline decode_intra_mb_internal(BR *p, MICROBLOCK *mb, int escape_t
return 0;
}
static int __inline decode_inter_mb_internal(BR *p, MICROBLOCK *mb, int escape_type, int qscale, int cbpc, int dquant)
static inline int decode_inter_mb_internal(BR *p, MICROBLOCK *mb, int escape_type, int qscale, int cbpc, int dquant)
{
int cbpy, cbp;
int i;
@@ -510,9 +510,6 @@ int decode_picture_header(BR *p, PICTURE *picture)
picture->escape_type = tmp;
picture->frame_number = get_bits(p, 8);
// printf("picture_format: %d\n", tmp);
// printf("picture_number: %d\n", get_bits(p, 8));
tmp = get_bits(p, 3);
switch (tmp)
{