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
bb9bc1fc
Commit
bb9bc1fc
authored
Nov 01, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
flicvideo: return more meaningful error codes
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
6a712e7f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
flicvideo.c
libavcodec/flicvideo.c
+10
-10
No files found.
libavcodec/flicvideo.c
View file @
bb9bc1fc
...
@@ -134,10 +134,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
...
@@ -134,10 +134,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
case
16
:
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB565
;
break
;
case
16
:
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB565
;
break
;
case
24
:
avctx
->
pix_fmt
=
AV_PIX_FMT_BGR24
;
/* Supposedly BGR, but havent any files to test with */
case
24
:
avctx
->
pix_fmt
=
AV_PIX_FMT_BGR24
;
/* Supposedly BGR, but havent any files to test with */
av_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC/FLX is unsupported due to no test files.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC/FLX is unsupported due to no test files.
\n
"
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
default
:
default
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown FLC/FLX depth of %d Bpp is unsupported.
\n
"
,
depth
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown FLC/FLX depth of %d Bpp is unsupported.
\n
"
,
depth
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
avcodec_get_frame_defaults
(
&
s
->
frame
);
avcodec_get_frame_defaults
(
&
s
->
frame
);
...
@@ -165,7 +165,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
...
@@ -165,7 +165,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
unsigned
int
chunk_size
;
unsigned
int
chunk_size
;
int
chunk_type
;
int
chunk_type
;
int
i
,
j
;
int
i
,
j
,
ret
;
int
color_packets
;
int
color_packets
;
int
color_changes
;
int
color_changes
;
...
@@ -187,9 +187,9 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
...
@@ -187,9 +187,9 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
s
->
frame
.
reference
=
3
;
s
->
frame
.
reference
=
3
;
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
FF_BUFFER_HINTS_REUSABLE
;
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
FF_BUFFER_HINTS_REUSABLE
;
if
(
avctx
->
reget_buffer
(
avctx
,
&
s
->
frame
)
<
0
)
{
if
(
(
ret
=
avctx
->
reget_buffer
(
avctx
,
&
s
->
frame
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
}
pixels
=
s
->
frame
.
data
[
0
];
pixels
=
s
->
frame
.
data
[
0
];
...
@@ -485,7 +485,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
...
@@ -485,7 +485,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
unsigned
int
chunk_size
;
unsigned
int
chunk_size
;
int
chunk_type
;
int
chunk_type
;
int
i
,
j
;
int
i
,
j
,
ret
;
int
lines
;
int
lines
;
int
compressed_lines
;
int
compressed_lines
;
...
@@ -502,9 +502,9 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
...
@@ -502,9 +502,9 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
s
->
frame
.
reference
=
3
;
s
->
frame
.
reference
=
3
;
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
FF_BUFFER_HINTS_REUSABLE
;
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
FF_BUFFER_HINTS_REUSABLE
;
if
(
avctx
->
reget_buffer
(
avctx
,
&
s
->
frame
)
<
0
)
{
if
(
(
ret
=
avctx
->
reget_buffer
(
avctx
,
&
s
->
frame
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
}
pixels
=
s
->
frame
.
data
[
0
];
pixels
=
s
->
frame
.
data
[
0
];
...
@@ -759,7 +759,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx,
...
@@ -759,7 +759,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx,
const
uint8_t
*
buf
,
int
buf_size
)
const
uint8_t
*
buf
,
int
buf_size
)
{
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC Unsupported due to lack of test files.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC Unsupported due to lack of test files.
\n
"
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
}
static
int
flic_decode_frame
(
AVCodecContext
*
avctx
,
static
int
flic_decode_frame
(
AVCodecContext
*
avctx
,
...
@@ -787,7 +787,7 @@ static int flic_decode_frame(AVCodecContext *avctx,
...
@@ -787,7 +787,7 @@ static int flic_decode_frame(AVCodecContext *avctx,
/* the finite set of possibilites allowable by here. */
/* the finite set of possibilites allowable by here. */
/* But in case we do, just error out. */
/* But in case we do, just error out. */
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown FLC format, my science cannot explain how this happened.
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown FLC format, my science cannot explain how this happened.
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
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