Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
e6d8acf6
Commit
e6d8acf6
authored
Jul 03, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
indeo: use a typedef for the mc function pointer
parent
d222f6e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
ivi_common.c
libavcodec/ivi_common.c
+5
-4
No files found.
libavcodec/ivi_common.c
View file @
e6d8acf6
...
@@ -41,6 +41,9 @@ extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tabl
...
@@ -41,6 +41,9 @@ extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tabl
static
VLC
ivi_mb_vlc_tabs
[
8
];
///< static macroblock Huffman tables
static
VLC
ivi_mb_vlc_tabs
[
8
];
///< static macroblock Huffman tables
static
VLC
ivi_blk_vlc_tabs
[
8
];
///< static block Huffman tables
static
VLC
ivi_blk_vlc_tabs
[
8
];
///< static block Huffman tables
typedef
void
(
*
ivi_mc_func
)
(
int16_t
*
buf
,
const
int16_t
*
ref_buf
,
uint32_t
pitch
,
int
mc_type
);
/**
/**
* Reverse "nbits" bits of the value "val" and return the result
* Reverse "nbits" bits of the value "val" and return the result
* in the least significant bits.
* in the least significant bits.
...
@@ -394,8 +397,7 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile
...
@@ -394,8 +397,7 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile
uint32_t
cbp
,
sym
,
lo
,
hi
,
quant
,
buf_offs
,
q
;
uint32_t
cbp
,
sym
,
lo
,
hi
,
quant
,
buf_offs
,
q
;
IVIMbInfo
*
mb
;
IVIMbInfo
*
mb
;
RVMapDesc
*
rvmap
=
band
->
rv_map
;
RVMapDesc
*
rvmap
=
band
->
rv_map
;
void
(
*
mc_with_delta_func
)(
int16_t
*
buf
,
const
int16_t
*
ref_buf
,
uint32_t
pitch
,
int
mc_type
);
ivi_mc_func
mc_with_delta_func
,
mc_no_delta_func
;
void
(
*
mc_no_delta_func
)
(
int16_t
*
buf
,
const
int16_t
*
ref_buf
,
uint32_t
pitch
,
int
mc_type
);
const
uint16_t
*
base_tab
;
const
uint16_t
*
base_tab
;
const
uint8_t
*
scale_tab
;
const
uint8_t
*
scale_tab
;
...
@@ -567,8 +569,7 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
...
@@ -567,8 +569,7 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
IVIMbInfo
*
mb
,
*
ref_mb
;
IVIMbInfo
*
mb
,
*
ref_mb
;
const
int16_t
*
src
;
const
int16_t
*
src
;
int16_t
*
dst
;
int16_t
*
dst
;
void
(
*
mc_no_delta_func
)(
int16_t
*
buf
,
const
int16_t
*
ref_buf
,
uint32_t
pitch
,
ivi_mc_func
mc_no_delta_func
;
int
mc_type
);
if
(
tile
->
num_MBs
!=
IVI_MBs_PER_TILE
(
tile
->
width
,
tile
->
height
,
band
->
mb_size
))
{
if
(
tile
->
num_MBs
!=
IVI_MBs_PER_TILE
(
tile
->
width
,
tile
->
height
,
band
->
mb_size
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Allocated tile size %d mismatches "
av_log
(
avctx
,
AV_LOG_ERROR
,
"Allocated tile size %d mismatches "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment