From a4d34e218f548d381e09c483e8dc6ad18a8d571c Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 31 Mar 2015 10:35:15 +0200
Subject: h264: disable ER by default

The way it is currently designed is fundamentally unsafe and cannot be
reasonably fixed without completely rewriting it.
---
 libavcodec/h264_picture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec/h264_picture.c')

diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 5792f77..694ddb9 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);
-- 
cgit v1.1