har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'

Browse Source 
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
  h264: fix build when error resilience is disabled

Conflicts:
	libavcodec/h264_picture.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-20 23:18:45 +02:00
commit 4667116c39
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

@ -183,6 +183,7 @@ int ff_h264_field_end(H264Context *h, int in_setup)
h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_picture_complete(h); ff_vdpau_h264_picture_complete(h);
#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
@ -195,10 +196,12 @@ 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) && h->current_slice && !h->sps.new) { if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new) {
ff_h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); ff_h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr);
ff_er_frame_end(&h->er); ff_er_frame_end(&h->er);
} }
#endif /* CONFIG_ERROR_RESILIENCE */
if (!in_setup && !h->droppable) if (!in_setup && !h->droppable)
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
h->picture_structure == PICT_BOTTOM_FIELD); h->picture_structure == PICT_BOTTOM_FIELD);