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
edb2426b
Commit
edb2426b
authored
Nov 16, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxa: return meaningful error codes.
parent
adf0110d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
dxa.c
libavcodec/dxa.c
+7
-7
No files found.
libavcodec/dxa.c
View file @
edb2426b
...
...
@@ -180,7 +180,7 @@ static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst, uint
break
;
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown opcode %d
\n
"
,
type
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
dst
+=
stride
*
4
;
...
...
@@ -196,7 +196,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
DxaDecContext
*
const
c
=
avctx
->
priv_data
;
uint8_t
*
outptr
,
*
srcptr
,
*
tmpptr
;
unsigned
long
dsize
;
int
i
,
j
,
compr
;
int
i
,
j
,
compr
,
ret
;
int
stride
;
int
orig_buf_size
=
buf_size
;
int
pc
=
0
;
...
...
@@ -216,9 +216,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
buf_size
-=
768
+
4
;
}
if
(
ff_get_buffer
(
avctx
,
&
c
->
pic
)
<
0
)
{
if
((
ret
=
ff_get_buffer
(
avctx
,
&
c
->
pic
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
memcpy
(
c
->
pic
.
data
[
1
],
c
->
pal
,
AVPALETTE_SIZE
);
c
->
pic
.
palette_has_changed
=
pc
;
...
...
@@ -236,7 +236,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
dsize
=
c
->
dsize
;
if
((
compr
!=
4
&&
compr
!=
-
1
)
&&
uncompress
(
c
->
decomp_buf
,
&
dsize
,
buf
+
9
,
buf_size
-
9
)
!=
Z_OK
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"Uncompress failed!
\n
"
);
return
-
1
;
return
AVERROR_UNKNOWN
;
}
switch
(
compr
){
case
-
1
:
...
...
@@ -275,7 +275,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
break
;
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown/unsupported compression type %d
\n
"
,
buf
[
4
]);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
FFSWAP
(
AVFrame
,
c
->
pic
,
c
->
prev
);
...
...
@@ -298,7 +298,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
c
->
dsize
=
avctx
->
width
*
avctx
->
height
*
2
;
if
((
c
->
decomp_buf
=
av_malloc
(
c
->
dsize
))
==
NULL
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Can't allocate decompression buffer.
\n
"
);
return
-
1
;
return
AVERROR
(
ENOMEM
)
;
}
return
0
;
...
...
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