Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ca1e36a8
Commit
ca1e36a8
authored
Jun 20, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: fix build when error resilience is disabled
parent
9e500efd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
h264_picture.c
libavcodec/h264_picture.c
+4
-1
No files found.
libavcodec/h264_picture.c
View file @
ca1e36a8
...
@@ -171,6 +171,7 @@ int ff_h264_field_end(H264Context *h, int in_setup)
...
@@ -171,6 +171,7 @@ int ff_h264_field_end(H264Context *h, int in_setup)
"hardware accelerator failed to decode picture
\n
"
);
"hardware accelerator failed to decode picture
\n
"
);
}
}
#if CONFIG_ERROR_RESILIENCE
/*
/*
* FIXME: Error handling code does not seem to support interlaced
* FIXME: Error handling code does not seem to support interlaced
* when slices span multiple rows
* when slices span multiple rows
...
@@ -183,7 +184,7 @@ int ff_h264_field_end(H264Context *h, int in_setup)
...
@@ -183,7 +184,7 @@ int ff_h264_field_end(H264Context *h, int in_setup)
* past end by one (callers fault) and resync_mb_y != 0
* past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too.
* causes problems for the first MB line, too.
*/
*/
if
(
CONFIG_ERROR_RESILIENCE
&&
!
FIELD_PICTURE
(
h
))
{
if
(
!
FIELD_PICTURE
(
h
))
{
h264_set_erpic
(
&
h
->
er
.
cur_pic
,
h
->
cur_pic_ptr
);
h264_set_erpic
(
&
h
->
er
.
cur_pic
,
h
->
cur_pic_ptr
);
h264_set_erpic
(
&
h
->
er
.
last_pic
,
h264_set_erpic
(
&
h
->
er
.
last_pic
,
h
->
ref_count
[
0
]
?
&
h
->
ref_list
[
0
][
0
]
:
NULL
);
h
->
ref_count
[
0
]
?
&
h
->
ref_list
[
0
][
0
]
:
NULL
);
...
@@ -191,6 +192,8 @@ int ff_h264_field_end(H264Context *h, int in_setup)
...
@@ -191,6 +192,8 @@ int ff_h264_field_end(H264Context *h, int in_setup)
h
->
ref_count
[
1
]
?
&
h
->
ref_list
[
1
][
0
]
:
NULL
);
h
->
ref_count
[
1
]
?
&
h
->
ref_list
[
1
][
0
]
:
NULL
);
ff_er_frame_end
(
&
h
->
er
);
ff_er_frame_end
(
&
h
->
er
);
}
}
#endif
/* CONFIG_ERROR_RESILIENCE */
emms_c
();
emms_c
();
h
->
current_slice
=
0
;
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