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
2accdd38
Commit
2accdd38
authored
Apr 04, 2018
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/libaomdec: fix broken pix_fmt changes from the previous commit
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
a866cc3a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
libaomdec.c
libavcodec/libaomdec.c
+6
-6
No files found.
libavcodec/libaomdec.c
View file @
2accdd38
...
...
@@ -103,11 +103,13 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
avctx
->
profile
=
FF_PROFILE_AV1_MAIN
;
return
0
;
}
else
if
(
img
->
bit_depth
==
10
)
{
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV420P10
;
avctx
->
pix_fmt
=
img
->
monochrome
?
AV_PIX_FMT_GRAY10
:
AV_PIX_FMT_YUV420P10
;
avctx
->
profile
=
FF_PROFILE_AV1_MAIN
;
return
0
;
}
else
if
(
img
->
bit_depth
==
12
)
{
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV420P12
;
avctx
->
pix_fmt
=
img
->
monochrome
?
AV_PIX_FMT_GRAY12
:
AV_PIX_FMT_YUV420P12
;
avctx
->
profile
=
FF_PROFILE_AV1_PROFESSIONAL
;
return
0
;
}
else
{
...
...
@@ -116,8 +118,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
case
AOM_IMG_FMT_I422
:
case
AOM_IMG_FMT_I42216
:
if
(
img
->
bit_depth
==
8
)
{
avctx
->
pix_fmt
=
img
->
monochrome
?
AV_PIX_FMT_GRAY10
:
AV_PIX_FMT_YUV420P10
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P
;
avctx
->
profile
=
FF_PROFILE_AV1_PROFESSIONAL
;
return
0
;
}
else
if
(
img
->
bit_depth
==
10
)
{
...
...
@@ -134,8 +135,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
case
AOM_IMG_FMT_I444
:
case
AOM_IMG_FMT_I44416
:
if
(
img
->
bit_depth
==
8
)
{
avctx
->
pix_fmt
=
img
->
monochrome
?
AV_PIX_FMT_GRAY12
:
AV_PIX_FMT_YUV420P12
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV444P
;
avctx
->
profile
=
FF_PROFILE_AV1_HIGH
;
return
0
;
}
else
if
(
img
->
bit_depth
==
10
)
{
...
...
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