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
a9275b4f
Commit
a9275b4f
authored
Dec 20, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: Fix code to also handle pix format changes.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
41135b7f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
h264.c
libavcodec/h264.c
+7
-4
No files found.
libavcodec/h264.c
View file @
a9275b4f
...
@@ -2730,6 +2730,13 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
...
@@ -2730,6 +2730,13 @@ 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
(
s
->
mb_width
!=
h
->
sps
.
mb_width
||
s
->
mb_height
!=
h
->
sps
.
mb_height
*
(
2
-
h
->
sps
.
frame_mbs_only_flag
)
||
s
->
avctx
->
bits_per_raw_sample
!=
h
->
sps
.
bit_depth_luma
||
h
->
cur_chroma_format_idc
!=
h
->
sps
.
chroma_format_idc
)
needs_reinit
=
1
;
if
((
ret
=
h264_set_parameter_from_sps
(
h
))
<
0
)
if
((
ret
=
h264_set_parameter_from_sps
(
h
))
<
0
)
return
ret
;
return
ret
;
}
}
...
@@ -2738,10 +2745,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
...
@@ -2738,10 +2745,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s
->
avctx
->
level
=
h
->
sps
.
level_idc
;
s
->
avctx
->
level
=
h
->
sps
.
level_idc
;
s
->
avctx
->
refs
=
h
->
sps
.
ref_frame_count
;
s
->
avctx
->
refs
=
h
->
sps
.
ref_frame_count
;
if
(
s
->
mb_width
!=
h
->
sps
.
mb_width
||
s
->
mb_height
!=
h
->
sps
.
mb_height
*
(
2
-
h
->
sps
.
frame_mbs_only_flag
))
needs_reinit
=
1
;
must_reinit
=
(
s
->
context_initialized
&&
must_reinit
=
(
s
->
context_initialized
&&
(
16
*
h
->
sps
.
mb_width
!=
s
->
avctx
->
coded_width
(
16
*
h
->
sps
.
mb_width
!=
s
->
avctx
->
coded_width
||
16
*
h
->
sps
.
mb_height
*
(
2
-
h
->
sps
.
frame_mbs_only_flag
)
!=
s
->
avctx
->
coded_height
||
16
*
h
->
sps
.
mb_height
*
(
2
-
h
->
sps
.
frame_mbs_only_flag
)
!=
s
->
avctx
->
coded_height
...
...
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