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
a339e919
Commit
a339e919
authored
Sep 07, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ea: Change type of array stride parameters to ptrdiff_t
ptrdiff_t is the correct type for array strides and similar.
parent
ba479f3d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
11 deletions
+13
-11
eacmv.c
libavcodec/eacmv.c
+2
-2
eaidct.c
libavcodec/eaidct.c
+2
-1
eaidct.h
libavcodec/eaidct.h
+2
-1
eamad.c
libavcodec/eamad.c
+2
-2
eatgq.c
libavcodec/eatgq.c
+3
-3
eatgv.c
libavcodec/eatgv.c
+1
-1
eatqi.c
libavcodec/eatqi.c
+1
-1
No files found.
libavcodec/eacmv.c
View file @
a339e919
...
...
@@ -71,8 +71,8 @@ static void cmv_decode_intra(CmvContext * s, AVFrame *frame,
}
}
static
void
cmv_motcomp
(
unsigned
char
*
dst
,
in
t
dst_stride
,
const
unsigned
char
*
src
,
in
t
src_stride
,
static
void
cmv_motcomp
(
unsigned
char
*
dst
,
ptrdiff_
t
dst_stride
,
const
unsigned
char
*
src
,
ptrdiff_
t
src_stride
,
int
x
,
int
y
,
int
xoffset
,
int
yoffset
,
int
width
,
int
height
){
...
...
libavcodec/eaidct.c
View file @
a339e919
...
...
@@ -77,7 +77,8 @@ static inline void ea_idct_col(int16_t *dest, const int16_t *src) {
IDCT_COL
(
dest
,
src
);
}
void
ff_ea_idct_put_c
(
uint8_t
*
dest
,
int
linesize
,
int16_t
*
block
)
{
void
ff_ea_idct_put_c
(
uint8_t
*
dest
,
ptrdiff_t
linesize
,
int16_t
*
block
)
{
int
i
;
int16_t
temp
[
64
];
block
[
0
]
+=
4
;
...
...
libavcodec/eaidct.h
View file @
a339e919
...
...
@@ -19,8 +19,9 @@
#ifndef AVCODEC_EAIDCT_H
#define AVCODEC_EAIDCT_H
#include <stddef.h>
#include <stdint.h>
void
ff_ea_idct_put_c
(
uint8_t
*
dest
,
in
t
linesize
,
int16_t
*
block
);
void
ff_ea_idct_put_c
(
uint8_t
*
dest
,
ptrdiff_
t
linesize
,
int16_t
*
block
);
#endif
/* AVCODEC_EAIDCT_H */
libavcodec/eamad.c
View file @
a339e919
...
...
@@ -80,8 +80,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
return
0
;
}
static
inline
void
comp
(
unsigned
char
*
dst
,
in
t
dst_stride
,
unsigned
char
*
src
,
in
t
src_stride
,
int
add
)
static
inline
void
comp
(
unsigned
char
*
dst
,
ptrdiff_
t
dst_stride
,
unsigned
char
*
src
,
ptrdiff_
t
src_stride
,
int
add
)
{
int
j
,
i
;
for
(
j
=
0
;
j
<
8
;
j
++
)
...
...
libavcodec/eatgq.c
View file @
a339e919
...
...
@@ -107,7 +107,7 @@ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb
static
void
tgq_idct_put_mb
(
TgqContext
*
s
,
int16_t
(
*
block
)[
64
],
AVFrame
*
frame
,
int
mb_x
,
int
mb_y
)
{
in
t
linesize
=
frame
->
linesize
[
0
];
ptrdiff_
t
linesize
=
frame
->
linesize
[
0
];
uint8_t
*
dest_y
=
frame
->
data
[
0
]
+
(
mb_y
*
16
*
linesize
)
+
mb_x
*
16
;
uint8_t
*
dest_cb
=
frame
->
data
[
1
]
+
(
mb_y
*
8
*
frame
->
linesize
[
1
])
+
mb_x
*
8
;
uint8_t
*
dest_cr
=
frame
->
data
[
2
]
+
(
mb_y
*
8
*
frame
->
linesize
[
2
])
+
mb_x
*
8
;
...
...
@@ -123,7 +123,7 @@ static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
}
static
inline
void
tgq_dconly
(
TgqContext
*
s
,
unsigned
char
*
dst
,
in
t
dst_stride
,
int
dc
)
ptrdiff_
t
dst_stride
,
int
dc
)
{
int
level
=
av_clip_uint8
((
dc
*
s
->
qtable
[
0
]
+
2056
)
>>
4
);
int
j
;
...
...
@@ -134,7 +134,7 @@ static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
static
void
tgq_idct_put_mb_dconly
(
TgqContext
*
s
,
AVFrame
*
frame
,
int
mb_x
,
int
mb_y
,
const
int8_t
*
dc
)
{
in
t
linesize
=
frame
->
linesize
[
0
];
ptrdiff_
t
linesize
=
frame
->
linesize
[
0
];
uint8_t
*
dest_y
=
frame
->
data
[
0
]
+
(
mb_y
*
16
*
linesize
)
+
mb_x
*
16
;
uint8_t
*
dest_cb
=
frame
->
data
[
1
]
+
(
mb_y
*
8
*
frame
->
linesize
[
1
])
+
mb_x
*
8
;
uint8_t
*
dest_cr
=
frame
->
data
[
2
]
+
(
mb_y
*
8
*
frame
->
linesize
[
2
])
+
mb_x
*
8
;
...
...
libavcodec/eatgv.c
View file @
a339e919
...
...
@@ -225,7 +225,7 @@ static int tgv_decode_inter(TgvContext *s, AVFrame *frame,
for
(
x
=
0
;
x
<
s
->
avctx
->
width
/
4
;
x
++
)
{
unsigned
int
vector
=
get_bits
(
&
gb
,
vector_bits
);
const
uint8_t
*
src
;
in
t
src_stride
;
ptrdiff_
t
src_stride
;
if
(
vector
<
num_mvs
)
{
int
mx
=
x
*
4
+
s
->
mv_codebook
[
vector
][
0
];
...
...
libavcodec/eatqi.c
View file @
a339e919
...
...
@@ -90,7 +90,7 @@ static inline void tqi_idct_put(AVCodecContext *avctx, AVFrame *frame,
int16_t
(
*
block
)[
64
])
{
TqiContext
*
t
=
avctx
->
priv_data
;
in
t
linesize
=
frame
->
linesize
[
0
];
ptrdiff_
t
linesize
=
frame
->
linesize
[
0
];
uint8_t
*
dest_y
=
frame
->
data
[
0
]
+
t
->
mb_y
*
16
*
linesize
+
t
->
mb_x
*
16
;
uint8_t
*
dest_cb
=
frame
->
data
[
1
]
+
t
->
mb_y
*
8
*
frame
->
linesize
[
1
]
+
t
->
mb_x
*
8
;
uint8_t
*
dest_cr
=
frame
->
data
[
2
]
+
t
->
mb_y
*
8
*
frame
->
linesize
[
2
]
+
t
->
mb_x
*
8
;
...
...
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