RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-09 18:53:12 +00:00
Code Issues Projects Releases Wiki Activity

h264: fix build when error resilience is disabled

Browse Source
This commit is contained in:
Vittorio Giovara 2014-06-20 12:48:06 -04:00
parent 9e500efdbe
commit ca1e36a8e4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264_picture.c
View File

@ -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)
* 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)
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;