diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 14:02:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 14:02:03 +0200 |
| commit | e0492311c8541da55a4b08641364ce8e1a169740 (patch) | |
| tree | 2842224326b912fe570668965fb4d9773d021570 /libavcodec/hevc.h | |
| parent | 4a73fa19ca7ac74f16422eabf731b86796b7d588 (diff) | |
| parent | e76f2d11970484266e67a12961f2339a5c2fccf9 (diff) | |
| download | ffmpeg-e0492311c8541da55a4b08641364ce8e1a169740.tar.gz | |
Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'
* commit 'e76f2d11970484266e67a12961f2339a5c2fccf9':
hevc: eliminate the last element from TransformTree
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index d2a732d620..7ed74dba17 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -683,10 +683,6 @@ typedef struct PredictionUnit { uint8_t chroma_mode_c[4]; } PredictionUnit; -typedef struct TransformTree { - uint8_t cbf_luma; -} TransformTree; - typedef struct TransformUnit { DECLARE_ALIGNED(32, int16_t, coeffs[2][MAX_TB_SIZE * MAX_TB_SIZE]); int cu_qp_delta; @@ -760,7 +756,6 @@ typedef struct HEVCLocalContext { GetBitContext gb; CABACContext cc; - TransformTree tt; int8_t qp_y; int8_t curr_qp_y; |