diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2013-12-10 15:37:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 16:20:48 +0100 |
| commit | 679a6377e4948bce6e2cb28cf7ced4b1738e906e (patch) | |
| tree | 4fc0206f5fe0180c16ef0c8bfc098fc672403e58 /libavcodec/hevc.h | |
| parent | 6026a5ad4f135476c7a1f51f8cfa7f4cc2ca0283 (diff) | |
| download | ffmpeg-679a6377e4948bce6e2cb28cf7ced4b1738e906e.tar.gz | |
hevc: avoid some unnecessary differences with libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index bbb18973bd..83b72e574c 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -374,8 +374,6 @@ typedef struct HEVCVPS { uint8_t vps_poc_proportional_to_timing_flag; int vps_num_ticks_poc_diff_one; ///< vps_num_ticks_poc_diff_one_minus1 + 1 int vps_num_hrd_parameters; - - int vps_extension_flag; } HEVCVPS; typedef struct ScalingList { @@ -508,7 +506,7 @@ typedef struct HEVCPPS { int beta_offset; ///< beta_offset_div2 * 2 int tc_offset; ///< tc_offset_div2 * 2 - int scaling_list_data_present_flag; + uint8_t scaling_list_data_present_flag; ScalingList scaling_list; uint8_t lists_modification_present_flag; @@ -516,9 +514,6 @@ typedef struct HEVCPPS { int num_extra_slice_header_bits; uint8_t slice_header_extension_present_flag; - uint8_t pps_extension_flag; - uint8_t pps_extension_data_flag; - // Inferred parameters int *column_width; ///< ColumnWidth int *row_height; ///< RowHeight @@ -580,8 +575,7 @@ typedef struct SliceHeader { int beta_offset; ///< beta_offset_div2 * 2 int tc_offset; ///< tc_offset_div2 * 2 - int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand - + unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand int *entry_point_offset; int * offset; @@ -768,7 +762,7 @@ typedef struct HEVCLocalContext { typedef struct HEVCContext { const AVClass *c; // needed by private avoptions - AVCodecContext *avctx; + AVCodecContext *avctx; struct HEVCContext *sList[MAX_NB_THREADS]; @@ -791,9 +785,9 @@ typedef struct HEVCContext { AVFrame *tmp_frame; AVFrame *output_frame; - HEVCVPS *vps; + const HEVCVPS *vps; const HEVCSPS *sps; - HEVCPPS *pps; + const HEVCPPS *pps; AVBufferRef *vps_list[MAX_VPS_COUNT]; AVBufferRef *sps_list[MAX_SPS_COUNT]; AVBufferRef *pps_list[MAX_PPS_COUNT]; @@ -876,8 +870,8 @@ typedef struct HEVCContext { uint8_t md5[3][16]; uint8_t is_md5; - int context_initialized; - int is_nalff; ///< this flag is != 0 if bitstream is encapsulated + uint8_t context_initialized; + uint8_t is_nalff; ///< this flag is != 0 if bitstream is encapsulated ///< as a format defined in 14496-15 int apply_defdispwin; |