diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 01:49:57 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 01:52:54 +0300 |
commit | 6da7625cc395692a71c99d179cb76eea6e8b27ca (patch) | |
tree | e9cc769a62e44a17288e89aab2139a91e4e79402 /libavcodec/h264.h | |
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.h')
-rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d27f0b4f7b..e651d8a4c2 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -788,6 +788,8 @@ typedef struct H264Context { int parse_history_count; int parse_last_mb; + int enable_er; + AVBufferPool *qscale_table_pool; AVBufferPool *mb_type_pool; AVBufferPool *motion_val_pool; |