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
0859eaa0
Commit
0859eaa0
authored
Nov 20, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cyuv: return meaningful error codes.
parent
6837bd6e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
cyuv.c
libavcodec/cyuv.c
+5
-4
No files found.
libavcodec/cyuv.c
View file @
0859eaa0
...
@@ -52,7 +52,7 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx)
...
@@ -52,7 +52,7 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx)
s
->
width
=
avctx
->
width
;
s
->
width
=
avctx
->
width
;
/* width needs to be divisible by 4 for this codec to work */
/* width needs to be divisible by 4 for this codec to work */
if
(
s
->
width
&
0x3
)
if
(
s
->
width
&
0x3
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
s
->
height
=
avctx
->
height
;
s
->
height
=
avctx
->
height
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV411P
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV411P
;
...
@@ -83,6 +83,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
...
@@ -83,6 +83,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
int
stream_ptr
;
int
stream_ptr
;
unsigned
char
cur_byte
;
unsigned
char
cur_byte
;
int
pixel_groups
;
int
pixel_groups
;
int
ret
;
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AURA
)
{
if
(
avctx
->
codec_id
==
AV_CODEC_ID_AURA
)
{
y_table
=
u_table
;
y_table
=
u_table
;
...
@@ -95,7 +96,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
...
@@ -95,7 +96,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
if
(
buf_size
!=
48
+
s
->
height
*
(
s
->
width
*
3
/
4
))
{
if
(
buf_size
!=
48
+
s
->
height
*
(
s
->
width
*
3
/
4
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"got a buffer with %d bytes when %d were expected
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"got a buffer with %d bytes when %d were expected
\n
"
,
buf_size
,
48
+
s
->
height
*
(
s
->
width
*
3
/
4
));
buf_size
,
48
+
s
->
height
*
(
s
->
width
*
3
/
4
));
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
/* pixel data starts 48 bytes in, after 3x16-byte tables */
/* pixel data starts 48 bytes in, after 3x16-byte tables */
...
@@ -106,9 +107,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
...
@@ -106,9 +107,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
;
s
->
frame
.
buffer_hints
=
FF_BUFFER_HINTS_VALID
;
s
->
frame
.
reference
=
0
;
s
->
frame
.
reference
=
0
;
if
(
ff_get_buffer
(
avctx
,
&
s
->
frame
)
<
0
)
{
if
(
(
ret
=
ff_get_buffer
(
avctx
,
&
s
->
frame
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
}
y_plane
=
s
->
frame
.
data
[
0
];
y_plane
=
s
->
frame
.
data
[
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