Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
d6da3729
Commit
d6da3729
authored
Oct 27, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eacmv: stop using deprecated avcodec_set_dimensions
parent
babbec08
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
eacmv.c
libavcodec/eacmv.c
+12
-6
No files found.
libavcodec/eacmv.c
View file @
d6da3729
...
@@ -129,19 +129,21 @@ static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
...
@@ -129,19 +129,21 @@ static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
}
}
}
}
static
void
cmv_process_header
(
CmvContext
*
s
,
const
uint8_t
*
buf
,
const
uint8_t
*
buf_end
)
static
int
cmv_process_header
(
CmvContext
*
s
,
const
uint8_t
*
buf
,
const
uint8_t
*
buf_end
)
{
{
int
pal_start
,
pal_count
,
i
;
int
pal_start
,
pal_count
,
i
,
ret
;
if
(
buf_end
-
buf
<
16
)
{
if
(
buf_end
-
buf
<
16
)
{
av_log
(
s
->
avctx
,
AV_LOG_WARNING
,
"truncated header
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_WARNING
,
"truncated header
\n
"
);
return
;
return
AVERROR_INVALIDDATA
;
}
}
s
->
width
=
AV_RL16
(
&
buf
[
4
]);
s
->
width
=
AV_RL16
(
&
buf
[
4
]);
s
->
height
=
AV_RL16
(
&
buf
[
6
]);
s
->
height
=
AV_RL16
(
&
buf
[
6
]);
if
(
s
->
avctx
->
width
!=
s
->
width
||
s
->
avctx
->
height
!=
s
->
height
)
avcodec_set_dimensions
(
s
->
avctx
,
s
->
width
,
s
->
height
);
ret
=
ff_set_dimensions
(
s
->
avctx
,
s
->
width
,
s
->
height
);
if
(
ret
<
0
)
return
ret
;
s
->
avctx
->
time_base
.
num
=
1
;
s
->
avctx
->
time_base
.
num
=
1
;
s
->
avctx
->
time_base
.
den
=
AV_RL16
(
&
buf
[
10
]);
s
->
avctx
->
time_base
.
den
=
AV_RL16
(
&
buf
[
10
]);
...
@@ -154,6 +156,8 @@ static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t
...
@@ -154,6 +156,8 @@ static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t
s
->
palette
[
i
]
=
AV_RB24
(
buf
);
s
->
palette
[
i
]
=
AV_RB24
(
buf
);
buf
+=
3
;
buf
+=
3
;
}
}
return
0
;
}
}
#define EA_PREAMBLE_SIZE 8
#define EA_PREAMBLE_SIZE 8
...
@@ -174,7 +178,9 @@ static int cmv_decode_frame(AVCodecContext *avctx,
...
@@ -174,7 +178,9 @@ static int cmv_decode_frame(AVCodecContext *avctx,
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
if
(
AV_RL32
(
buf
)
==
MVIh_TAG
||
AV_RB32
(
buf
)
==
MVIh_TAG
)
{
if
(
AV_RL32
(
buf
)
==
MVIh_TAG
||
AV_RB32
(
buf
)
==
MVIh_TAG
)
{
cmv_process_header
(
s
,
buf
+
EA_PREAMBLE_SIZE
,
buf_end
);
ret
=
cmv_process_header
(
s
,
buf
+
EA_PREAMBLE_SIZE
,
buf_end
);
if
(
ret
<
0
)
return
ret
;
return
buf_size
;
return
buf_size
;
}
}
...
...
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