diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 23:18:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 23:18:45 +0200 |
| commit | 4667116c394b29a96a1017e1bf130561676cb498 (patch) | |
| tree | 6b03ff9ca2751ee22343fa613a7cf3c813d2ead6 /libavcodec/h264_picture.c | |
| parent | fe43facd659f4bf04871d7736701011ebad98932 (diff) | |
| parent | ca1e36a8e4cd416142487071dbca734567bdaddf (diff) | |
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index b6b6d45dc9..b6bdae491b 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -183,6 +183,7 @@ int ff_h264_field_end(H264Context *h, int in_setup) h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_complete(h); +#if CONFIG_ERROR_RESILIENCE /* * FIXME: Error handling code does not seem to support interlaced * 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 * 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_er_frame_end(&h->er); } +#endif /* CONFIG_ERROR_RESILIENCE */ + if (!in_setup && !h->droppable) ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, h->picture_structure == PICT_BOTTOM_FIELD); |