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
6837bd6e
Commit
6837bd6e
authored
Nov 20, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
txd: return meaningful error codes.
parent
69c25c92
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
txd.c
libavcodec/txd.c
+8
-7
No files found.
libavcodec/txd.c
View file @
6837bd6e
...
...
@@ -51,6 +51,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
unsigned
int
y
,
v
;
uint8_t
*
ptr
;
uint32_t
*
pal
;
int
ret
;
bytestream2_init
(
&
gb
,
avpkt
->
data
,
avpkt
->
size
);
version
=
bytestream2_get_le32
(
&
gb
);
...
...
@@ -65,7 +66,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if
(
version
<
8
||
version
>
9
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"texture data version %i is unsupported
\n
"
,
version
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
if
(
depth
==
8
)
{
...
...
@@ -74,19 +75,19 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB32
;
}
else
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"depth of %i is unsupported
\n
"
,
depth
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
if
(
p
->
data
[
0
])
avctx
->
release_buffer
(
avctx
,
p
);
if
(
av_image_check_size
(
w
,
h
,
0
,
avctx
)
)
return
-
1
;
if
(
(
ret
=
av_image_check_size
(
w
,
h
,
0
,
avctx
))
<
0
)
return
ret
;
if
(
w
!=
avctx
->
width
||
h
!=
avctx
->
height
)
avcodec_set_dimensions
(
avctx
,
w
,
h
);
if
(
ff_get_buffer
(
avctx
,
p
)
<
0
)
{
if
(
(
ret
=
ff_get_buffer
(
avctx
,
p
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
p
->
pict_type
=
AV_PICTURE_TYPE_I
;
...
...
@@ -141,7 +142,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
unsupported:
av_log
(
avctx
,
AV_LOG_ERROR
,
"unsupported d3d format (%08x)
\n
"
,
d3d_format
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
static
av_cold
int
txd_end
(
AVCodecContext
*
avctx
)
{
...
...
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