diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:20:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:20:32 +0100 |
| commit | f1b20930f206349a666ec314d76c3fcb86c6b9a7 (patch) | |
| tree | a8a94489ff233ad1b5704eeec083110723761c78 /libavcodec/hevc.h | |
| parent | 7cbe1e044701898aadda9958ddb67f6ea95fc72b (diff) | |
| parent | 2c6a7f9348378f887066fb1669c46b9485e8ef3e (diff) | |
| download | ffmpeg-f1b20930f206349a666ec314d76c3fcb86c6b9a7.tar.gz | |
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
hevc: do not store rqt_root_cbf in the context
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 965ff0bfba..8fdefbbdcf 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -638,8 +638,6 @@ typedef struct CodingUnit { enum PredMode pred_mode; ///< PredMode enum PartMode part_mode; ///< PartMode - uint8_t rqt_root_cbf; - // Inferred parameters uint8_t intra_split_flag; ///< IntraSplitFlag uint8_t max_trafo_depth; ///< MaxTrafoDepth |