summaryrefslogtreecommitdiff
path: root/libavcodec/hevc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 11:05:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 11:06:13 +0100
commit7cbe1e044701898aadda9958ddb67f6ea95fc72b (patch)
tree06b168dc3a6bc86c905cc7cb4510fdc35cd3acd0 /libavcodec/hevc.h
parent9421d974bc79b0032861f31ffc360f6a11ff3529 (diff)
parent920bca3e2332dced9c78bd14cfc2ff138188bd57 (diff)
Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57': hevc: do not store pcm_flag in the context Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
-rw-r--r--libavcodec/hevc.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 7205a78e5c..965ff0bfba 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -640,8 +640,6 @@ typedef struct CodingUnit {
uint8_t rqt_root_cbf;
- uint8_t pcm_flag;
-
// Inferred parameters
uint8_t intra_split_flag; ///< IntraSplitFlag
uint8_t max_trafo_depth; ///< MaxTrafoDepth