diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
| commit | dc39ccdc3b88e9ec3b4aa3581798c30660d94d07 (patch) | |
| tree | ea6dd9bc79af60d63fe0edd905158b3440db23d4 /libavcodec/hevcdec.h | |
| parent | 0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb (diff) | |
| parent | 0bfdcce4d42a6e654c00ea5f9237dc987626457f (diff) | |
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevcdec.h')
| -rw-r--r-- | libavcodec/hevcdec.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index b6391eace8..0c7881286c 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -87,12 +87,6 @@ enum RPSType { NB_RPS_TYPE, }; -enum SliceType { - B_SLICE = 0, - P_SLICE = 1, - I_SLICE = 2, -}; - enum SyntaxElement { SAO_MERGE_FLAG = 0, SAO_TYPE_IDX, @@ -258,7 +252,7 @@ typedef struct SliceHeader { ///< address (in raster order) of the first block in the current slice unsigned int slice_addr; - enum SliceType slice_type; + enum HEVCSliceType slice_type; int pic_order_cnt_lsb; |