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
e2b30194
Commit
e2b30194
authored
Feb 19, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264/field_end move progress report code after error concealment.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
386dc9a3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
h264.c
libavcodec/h264.c
+3
-4
No files found.
libavcodec/h264.c
View file @
e2b30194
...
...
@@ -2821,10 +2821,6 @@ static int field_end(H264Context *h, int in_setup)
int
err
=
0
;
h
->
mb_y
=
0
;
if
(
!
in_setup
&&
!
h
->
droppable
)
ff_thread_report_progress
(
&
h
->
cur_pic_ptr
->
tf
,
INT_MAX
,
h
->
picture_structure
==
PICT_BOTTOM_FIELD
);
if
(
CONFIG_H264_VDPAU_DECODER
&&
h
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
)
ff_vdpau_h264_set_reference_frames
(
h
);
...
...
@@ -2867,6 +2863,9 @@ static int field_end(H264Context *h, int in_setup)
h
->
er
.
cur_pic
=
h
->
cur_pic_ptr
;
ff_er_frame_end
(
&
h
->
er
);
}
if
(
!
in_setup
&&
!
h
->
droppable
)
ff_thread_report_progress
(
&
h
->
cur_pic_ptr
->
tf
,
INT_MAX
,
h
->
picture_structure
==
PICT_BOTTOM_FIELD
);
emms_c
();
h
->
current_slice
=
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