highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2

Browse Source 
* commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-11 11:39:46 +01:00
parent 03ae616b19 ca2c9d6b9b
commit 0adde39e04
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hevc.h
View File

@@ -461,7 +461,7 @@ typedef struct HEVCSPS {
} HEVCSPS; } HEVCSPS;
typedef struct HEVCPPS { typedef struct HEVCPPS {
unsigned sps_id; ///< seq_parameter_set_id unsigned int sps_id; ///< seq_parameter_set_id
uint8_t sign_data_hiding_flag; uint8_t sign_data_hiding_flag;

8
libavcodec/hevc_ps.c
View File

@@ -611,8 +611,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
{ {
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
GetBitContext *gb = &s->HEVClc->gb; GetBitContext *gb = &s->HEVClc->gb;
int ret = 0; int ret = 0;
int sps_id = 0; unsigned int sps_id = 0;
int log2_diff_max_min_transform_block_size; int log2_diff_max_min_transform_block_size;
int bit_depth_chroma, start, vui_present, sublayer_ordering_info; int bit_depth_chroma, start, vui_present, sublayer_ordering_info;
int i; int i;
@@ -993,8 +993,8 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
int pic_area_in_ctbs, pic_area_in_min_cbs, pic_area_in_min_tbs; int pic_area_in_ctbs, pic_area_in_min_cbs, pic_area_in_min_tbs;
int log2_diff_ctb_min_tb_size; int log2_diff_ctb_min_tb_size;
int i, j, x, y, ctb_addr_rs, tile_id; int i, j, x, y, ctb_addr_rs, tile_id;
int ret = 0; int ret = 0;
int pps_id = 0; unsigned int pps_id = 0;
AVBufferRef *pps_buf; AVBufferRef *pps_buf;
HEVCPPS *pps = av_mallocz(sizeof(*pps)); HEVCPPS *pps = av_mallocz(sizeof(*pps));