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
aadb7b3a
Commit
aadb7b3a
authored
Oct 17, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/c93: use meaningful error codes
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
05b03370
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
c93.c
libavcodec/c93.c
+7
-7
No files found.
libavcodec/c93.c
View file @
aadb7b3a
...
@@ -83,7 +83,7 @@ static inline int copy_block(AVCodecContext *avctx, uint8_t *to,
...
@@ -83,7 +83,7 @@ static inline int copy_block(AVCodecContext *avctx, uint8_t *to,
if
(
from_y
+
height
>
HEIGHT
)
{
if
(
from_y
+
height
>
HEIGHT
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid offset %d during C93 decoding
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid offset %d during C93 decoding
\n
"
,
offset
);
offset
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
if
(
overflow
>
0
)
{
if
(
overflow
>
0
)
{
...
@@ -127,16 +127,16 @@ static int decode_frame(AVCodecContext *avctx, void *data,
...
@@ -127,16 +127,16 @@ static int decode_frame(AVCodecContext *avctx, void *data,
AVFrame
*
picture
=
data
;
AVFrame
*
picture
=
data
;
GetByteContext
gb
;
GetByteContext
gb
;
uint8_t
*
out
;
uint8_t
*
out
;
int
stride
,
i
,
x
,
y
,
b
,
bt
=
0
;
int
stride
,
ret
,
i
,
x
,
y
,
b
,
bt
=
0
;
c93
->
currentpic
^=
1
;
c93
->
currentpic
^=
1
;
newpic
->
reference
=
3
;
newpic
->
reference
=
3
;
newpic
->
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
newpic
->
buffer_hints
=
FF_BUFFER_HINTS_VALID
|
FF_BUFFER_HINTS_PRESERVE
|
FF_BUFFER_HINTS_REUSABLE
|
FF_BUFFER_HINTS_READABLE
;
FF_BUFFER_HINTS_REUSABLE
|
FF_BUFFER_HINTS_READABLE
;
if
(
avctx
->
reget_buffer
(
avctx
,
newpic
))
{
if
(
(
ret
=
avctx
->
reget_buffer
(
avctx
,
newpic
)
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
}
stride
=
newpic
->
linesize
[
0
];
stride
=
newpic
->
linesize
[
0
];
...
@@ -167,7 +167,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
...
@@ -167,7 +167,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
case
C93_8X8_FROM_PREV
:
case
C93_8X8_FROM_PREV
:
offset
=
bytestream2_get_le16
(
&
gb
);
offset
=
bytestream2_get_le16
(
&
gb
);
if
(
copy_block
(
avctx
,
out
,
copy_from
,
offset
,
8
,
stride
))
if
(
copy_block
(
avctx
,
out
,
copy_from
,
offset
,
8
,
stride
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
break
;
break
;
case
C93_4X4_FROM_CURR
:
case
C93_4X4_FROM_CURR
:
...
@@ -178,7 +178,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
...
@@ -178,7 +178,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
offset
=
bytestream2_get_le16
(
&
gb
);
offset
=
bytestream2_get_le16
(
&
gb
);
if
(
copy_block
(
avctx
,
&
out
[
j
*
stride
+
i
],
if
(
copy_block
(
avctx
,
&
out
[
j
*
stride
+
i
],
copy_from
,
offset
,
4
,
stride
))
copy_from
,
offset
,
4
,
stride
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
}
}
break
;
break
;
...
@@ -225,7 +225,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
...
@@ -225,7 +225,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
default:
default:
av_log
(
avctx
,
AV_LOG_ERROR
,
"unexpected type %x at %dx%d
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"unexpected type %x at %dx%d
\n
"
,
block_type
,
x
,
y
);
block_type
,
x
,
y
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
bt
>>=
4
;
bt
>>=
4
;
out
+=
8
;
out
+=
8
;
...
...
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