diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 15:10:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 15:30:50 +0100 |
| commit | c1362ca0479eedc6171306276f6ed4baa7e9882f (patch) | |
| tree | 9ecfaddc542e2842c7830e80607d3006c61e0a0d /libavcodec/hevc.h | |
| parent | 2b318f8ca91674aea75a0ab8c7e8a7ceae1a2ff1 (diff) | |
| parent | e588615d938f8581f0d6f3771662d08cadfc00de (diff) | |
Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'
* commit 'e588615d938f8581f0d6f3771662d08cadfc00de':
hevc: fix decoding of one PU wide files
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 4842752820..b47f1ea315 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -72,6 +72,8 @@ #define EPEL_EXTRA_AFTER 2 #define EPEL_EXTRA 3 +#define EDGE_EMU_BUFFER_STRIDE 80 + /** * Value of the luma sample at position (x, y) in the 2D array tab. */ @@ -730,8 +732,8 @@ typedef struct HEVCLocalContext { int start_of_tiles_x; int end_of_tiles_x; int end_of_tiles_y; - uint8_t *edge_emu_buffer; - int edge_emu_buffer_size; + /* +7 is for subpixel interpolation, *2 for high bit depths */ + DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer)[(MAX_PB_SIZE + 7) * EDGE_EMU_BUFFER_STRIDE * 2]; CodingTree ct; CodingUnit cu; PredictionUnit pu; |