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
8ea4a553
Commit
8ea4a553
authored
Dec 19, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: move h264_set_parameter_from_sps() call up
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
afc03268
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
h264.c
libavcodec/h264.c
+3
-3
No files found.
libavcodec/h264.c
View file @
8ea4a553
...
@@ -2602,6 +2602,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
...
@@ -2602,6 +2602,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h
->
current_sps_id
=
h
->
pps
.
sps_id
;
h
->
current_sps_id
=
h
->
pps
.
sps_id
;
h
->
sps
=
*
h0
->
sps_buffers
[
h
->
pps
.
sps_id
];
h
->
sps
=
*
h0
->
sps_buffers
[
h
->
pps
.
sps_id
];
if
((
ret
=
h264_set_parameter_from_sps
(
h
))
<
0
)
return
ret
;
}
}
s
->
avctx
->
profile
=
ff_h264_get_profile
(
&
h
->
sps
);
s
->
avctx
->
profile
=
ff_h264_get_profile
(
&
h
->
sps
);
...
@@ -2658,9 +2661,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
...
@@ -2658,9 +2661,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s
->
avctx
->
sample_aspect_ratio
=
h
->
sps
.
sar
;
s
->
avctx
->
sample_aspect_ratio
=
h
->
sps
.
sar
;
av_assert0
(
s
->
avctx
->
sample_aspect_ratio
.
den
);
av_assert0
(
s
->
avctx
->
sample_aspect_ratio
.
den
);
if
((
ret
=
h264_set_parameter_from_sps
(
h
))
<
0
)
return
ret
;
if
(
h
->
sps
.
video_signal_type_present_flag
)
{
if
(
h
->
sps
.
video_signal_type_present_flag
)
{
s
->
avctx
->
color_range
=
h
->
sps
.
full_range
>
0
?
AVCOL_RANGE_JPEG
s
->
avctx
->
color_range
=
h
->
sps
.
full_range
>
0
?
AVCOL_RANGE_JPEG
:
AVCOL_RANGE_MPEG
;
:
AVCOL_RANGE_MPEG
;
...
...
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