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
02d08da8
Commit
02d08da8
authored
Apr 10, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/caca: switch to codecpar
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
5501f58e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
caca.c
libavdevice/caca.c
+4
-4
No files found.
libavdevice/caca.c
View file @
02d08da8
...
...
@@ -92,7 +92,7 @@ static int caca_write_header(AVFormatContext *s)
{
CACAContext
*
c
=
s
->
priv_data
;
AVStream
*
st
=
s
->
streams
[
0
];
AVCodec
Context
*
encctx
=
st
->
codec
;
AVCodec
Parameters
*
encctx
=
st
->
codecpar
;
int
ret
,
bpp
;
c
->
ctx
=
s
;
...
...
@@ -126,10 +126,10 @@ static int caca_write_header(AVFormatContext *s)
return
AVERROR
(
EINVAL
);
}
if
(
encctx
->
pix_fm
t
!=
AV_PIX_FMT_RGB24
)
{
if
(
encctx
->
forma
t
!=
AV_PIX_FMT_RGB24
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Unsupported pixel format '%s', choose rgb24
\n
"
,
av_get_pix_fmt_name
(
encctx
->
pix_fm
t
));
av_get_pix_fmt_name
(
encctx
->
forma
t
));
return
AVERROR
(
EINVAL
);
}
...
...
@@ -140,7 +140,7 @@ static int caca_write_header(AVFormatContext *s)
goto
fail
;
}
bpp
=
av_get_bits_per_pixel
(
av_pix_fmt_desc_get
(
encctx
->
pix_fm
t
));
bpp
=
av_get_bits_per_pixel
(
av_pix_fmt_desc_get
(
encctx
->
forma
t
));
c
->
dither
=
caca_create_dither
(
bpp
,
encctx
->
width
,
encctx
->
height
,
bpp
/
8
*
encctx
->
width
,
0x0000ff
,
0x00ff00
,
0xff0000
,
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