diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-06-20 12:48:06 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-06-20 12:48:06 -0400 |
| commit | ca1e36a8e4cd416142487071dbca734567bdaddf (patch) | |
| tree | 9c8dd5d35144fe19ca24c05a64bb9cdb87b29235 /libavcodec | |
| parent | 9e500efdbe0deeff1602500ebc229a0a6b6bb1a2 (diff) | |
| download | ffmpeg-ca1e36a8e4cd416142487071dbca734567bdaddf.tar.gz | |
h264: fix build when error resilience is disabled
Diffstat (limited to 'libavcodec')
| -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 b35cc52033..1d7461b799 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -171,6 +171,7 @@ int ff_h264_field_end(H264Context *h, int in_setup) "hardware accelerator failed to decode picture\n"); } +#if CONFIG_ERROR_RESILIENCE /* * FIXME: Error handling code does not seem to support interlaced * 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 * 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.last_pic, 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); ff_er_frame_end(&h->er); } +#endif /* CONFIG_ERROR_RESILIENCE */ + emms_c(); h->current_slice = 0; |