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
bcd91f16
Commit
bcd91f16
authored
May 17, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: move a per-field block from decode_slice_header() to field_start()
This is a more appropriate place for it.
parent
17e7c03e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
h264_slice.c
libavcodec/h264_slice.c
+7
-9
No files found.
libavcodec/h264_slice.c
View file @
bcd91f16
...
...
@@ -1167,6 +1167,13 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
release_unused_pictures
(
h
,
0
);
}
ff_h264_init_poc
(
h
->
cur_pic_ptr
->
field_poc
,
&
h
->
cur_pic_ptr
->
poc
,
h
->
ps
.
sps
,
&
h
->
poc
,
h
->
picture_structure
,
nal
->
ref_idc
);
memcpy
(
h
->
mmco
,
sl
->
mmco
,
sl
->
nb_mmco
*
sizeof
(
*
h
->
mmco
));
h
->
nb_mmco
=
sl
->
nb_mmco
;
h
->
explicit_ref_marking
=
sl
->
explicit_ref_marking
;
return
0
;
}
...
...
@@ -1437,15 +1444,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
sl
->
resync_mb_y
=
sl
->
mb_y
=
sl
->
mb_y
+
1
;
assert
(
sl
->
mb_y
<
h
->
mb_height
);
if
(
!
h
->
setup_finished
)
{
ff_h264_init_poc
(
h
->
cur_pic_ptr
->
field_poc
,
&
h
->
cur_pic_ptr
->
poc
,
h
->
ps
.
sps
,
&
h
->
poc
,
h
->
picture_structure
,
nal
->
ref_idc
);
memcpy
(
h
->
mmco
,
sl
->
mmco
,
sl
->
nb_mmco
*
sizeof
(
*
h
->
mmco
));
h
->
nb_mmco
=
sl
->
nb_mmco
;
h
->
explicit_ref_marking
=
sl
->
explicit_ref_marking
;
}
ret
=
ff_h264_build_ref_list
(
h
,
sl
);
if
(
ret
<
0
)
return
ret
;
...
...
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