diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-03-31 10:35:15 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-04-03 13:14:43 +0200 |
| commit | a4d34e218f548d381e09c483e8dc6ad18a8d571c (patch) | |
| tree | bbd5fa30bade6bd43b1c7db67665baf154acb359 /libavcodec/h264_picture.c | |
| parent | 3892bdab9b652eb003ab95e167f1765e0b0ea035 (diff) | |
h264: disable ER by default
The way it is currently designed is fundamentally unsafe and cannot be
reasonably fixed without completely rewriting it.
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 5792f77c7c..694ddb9c8f 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -184,7 +184,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (!FIELD_PICTURE(h)) { + if (!FIELD_PICTURE(h) && h->enable_er) { h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr); h264_set_erpic(&sl->er.last_pic, sl->ref_count[0] ? sl->ref_list[0][0].parent : NULL); |