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
a5a0ef5e
Commit
a5a0ef5e
authored
May 17, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jpegls: return meaningful errors
parent
2768f7e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
jpeglsdec.c
libavcodec/jpeglsdec.c
+5
-6
No files found.
libavcodec/jpeglsdec.c
View file @
a5a0ef5e
...
@@ -68,13 +68,13 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
...
@@ -68,13 +68,13 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
case
2
:
case
2
:
case
3
:
case
3
:
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"palette not supported
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"palette not supported
\n
"
);
return
-
1
;
return
AVERROR
(
ENOSYS
)
;
case
4
:
case
4
:
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"oversize image not supported
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"oversize image not supported
\n
"
);
return
-
1
;
return
AVERROR
(
ENOSYS
)
;
default:
default:
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"invalid id %d
\n
"
,
id
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"invalid id %d
\n
"
,
id
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
av_dlog
(
s
->
avctx
,
"ID=%i, T=%i,%i,%i
\n
"
,
id
,
s
->
t1
,
s
->
t2
,
s
->
t3
);
av_dlog
(
s
->
avctx
,
"ID=%i, T=%i,%i,%i
\n
"
,
id
,
s
->
t1
,
s
->
t2
,
s
->
t3
);
...
@@ -346,11 +346,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
...
@@ -346,11 +346,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
cur
+=
s
->
picture_ptr
->
linesize
[
0
];
cur
+=
s
->
picture_ptr
->
linesize
[
0
];
}
}
}
else
if
(
ilv
==
2
)
{
/* sample interleaving */
}
else
if
(
ilv
==
2
)
{
/* sample interleaving */
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
avpriv_report_missing_feature
(
s
->
avctx
,
"Sample interleaved images"
);
"Sample interleaved images are not supported.
\n
"
);
av_free
(
state
);
av_free
(
state
);
av_free
(
zero
);
av_free
(
zero
);
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
}
if
(
shift
)
{
/* we need to do point transform or normalize samples */
if
(
shift
)
{
/* we need to do point transform or normalize samples */
...
...
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