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
ba5ff1b3
Commit
ba5ff1b3
authored
Sep 18, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264dec: add forgotten copying of h->sync
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
0ddcfa42
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
h264.c
libavcodec/h264.c
+5
-1
No files found.
libavcodec/h264.c
View file @
ba5ff1b3
...
...
@@ -1201,6 +1201,7 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex
copy_picture_range
(
h
->
delayed_pic
,
h1
->
delayed_pic
,
MAX_DELAYED_PIC_COUNT
+
2
,
s
,
s1
);
h
->
last_slice_type
=
h1
->
last_slice_type
;
h
->
sync
=
h1
->
sync
;
if
(
!
s
->
current_picture_ptr
)
return
0
;
...
...
@@ -1432,6 +1433,10 @@ static void decode_postinit(H264Context *h, int setup_finished){
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"no picture
\n
"
);
}
if
(
h
->
next_output_pic
&&
h
->
next_output_pic
->
sync
)
{
h
->
sync
|=
2
*!!
h
->
next_output_pic
->
f
.
key_frame
;
}
if
(
setup_finished
)
ff_thread_finish_setup
(
s
->
avctx
);
}
...
...
@@ -3920,7 +3925,6 @@ static int decode_frame(AVCodecContext *avctx,
*
data_size
=
0
;
/* Wait for second field. */
if
(
h
->
next_output_pic
&&
h
->
next_output_pic
->
sync
)
{
h
->
sync
|=
2
*!!
h
->
next_output_pic
->
f
.
key_frame
;
if
(
h
->
sync
>
1
||
h
->
next_output_pic
->
f
.
pict_type
!=
AV_PICTURE_TYPE_B
){
*
data_size
=
sizeof
(
AVFrame
);
*
pict
=
*
(
AVFrame
*
)
h
->
next_output_pic
;
...
...
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