diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:49:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:52:54 +0200 |
commit | 6da7625cc395692a71c99d179cb76eea6e8b27ca (patch) | |
tree | e9cc769a62e44a17288e89aab2139a91e4e79402 /libavcodec/h264_picture.c | |
parent | 959894632ae67e356ede734e352eabda6bb55794 (diff) | |
parent | a4d34e218f548d381e09c483e8dc6ad18a8d571c (diff) |
Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'
* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c':
h264: disable ER by default
Conflicts:
libavcodec/h264.c
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 127bc45c88..76286ae8f3 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -196,7 +196,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) && h->current_slice && !h->sps.new) { + if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new && h->enable_er) { int use_last_pic = h->last_pic_for_ec.f.buf[0] && !sl->ref_count[0]; ff_h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr); |