Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ec9f6493
Commit
ec9f6493
authored
Feb 01, 2008
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace get32() by AV_RL32().
Originally committed as revision 11755 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
530902f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
4xm.c
libavcodec/4xm.c
+11
-15
No files found.
libavcodec/4xm.c
View file @
ec9f6493
...
...
@@ -343,10 +343,6 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, int lo
}
}
static
int
get32
(
void
*
p
){
return
le2me_32
(
*
(
uint32_t
*
)
p
);
}
static
int
decode_p_frame
(
FourXContext
*
f
,
const
uint8_t
*
buf
,
int
length
){
int
x
,
y
;
const
int
width
=
f
->
avctx
->
width
;
...
...
@@ -358,9 +354,9 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){
if
(
f
->
version
>
1
){
extra
=
20
;
bitstream_size
=
get
32
(
buf
+
8
);
wordstream_size
=
get
32
(
buf
+
12
);
bytestream_size
=
get
32
(
buf
+
16
);
bitstream_size
=
AV_RL
32
(
buf
+
8
);
wordstream_size
=
AV_RL
32
(
buf
+
12
);
bytestream_size
=
AV_RL
32
(
buf
+
16
);
}
else
{
extra
=
0
;
bitstream_size
=
AV_RL16
(
buf
-
4
);
...
...
@@ -638,9 +634,9 @@ static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length){
const
int
height
=
f
->
avctx
->
height
;
uint16_t
*
dst
=
(
uint16_t
*
)
f
->
current_picture
.
data
[
0
];
const
int
stride
=
f
->
current_picture
.
linesize
[
0
]
>>
1
;
const
unsigned
int
bitstream_size
=
get
32
(
buf
);
const
int
token_count
av_unused
=
get
32
(
buf
+
bitstream_size
+
8
);
unsigned
int
prestream_size
=
4
*
get
32
(
buf
+
bitstream_size
+
4
);
const
unsigned
int
bitstream_size
=
AV_RL
32
(
buf
);
const
int
token_count
av_unused
=
AV_RL
32
(
buf
+
bitstream_size
+
8
);
unsigned
int
prestream_size
=
4
*
AV_RL
32
(
buf
+
bitstream_size
+
4
);
const
uint8_t
*
prestream
=
buf
+
bitstream_size
+
12
;
if
(
prestream_size
+
bitstream_size
+
12
!=
length
...
...
@@ -687,16 +683,16 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame
*
p
,
temp
;
int
i
,
frame_4cc
,
frame_size
;
frame_4cc
=
get
32
(
buf
);
if
(
buf_size
!=
get
32
(
buf
+
4
)
+
8
||
buf_size
<
20
){
av_log
(
f
->
avctx
,
AV_LOG_ERROR
,
"size mismatch %d %d
\n
"
,
buf_size
,
get
32
(
buf
+
4
));
frame_4cc
=
AV_RL
32
(
buf
);
if
(
buf_size
!=
AV_RL
32
(
buf
+
4
)
+
8
||
buf_size
<
20
){
av_log
(
f
->
avctx
,
AV_LOG_ERROR
,
"size mismatch %d %d
\n
"
,
buf_size
,
AV_RL
32
(
buf
+
4
));
}
if
(
frame_4cc
==
ff_get_fourcc
(
"cfrm"
)){
int
free_index
=-
1
;
const
int
data_size
=
buf_size
-
20
;
const
int
id
=
get
32
(
buf
+
12
);
const
int
whole_size
=
get
32
(
buf
+
16
);
const
int
id
=
AV_RL
32
(
buf
+
12
);
const
int
whole_size
=
AV_RL
32
(
buf
+
16
);
CFrameBuffer
*
cfrm
;
for
(
i
=
0
;
i
<
CFRAME_BUFFER_COUNT
;
i
++
){
...
...
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