summaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc_ps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-09 21:44:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-09 21:44:40 +0100
commiteaaa5801efec0888a5ab243e9befd91163b79d06 (patch)
treec60def7308f8fe751d19f68c82e25792245edd31 /libavcodec/hevc_ps.c
parent06219db9351cc2862913edb486ecc1573523502d (diff)
parent4d33873c2990b8d6096f60fef384f0efc4482b55 (diff)
downloadffmpeg-streaming-eaaa5801efec0888a5ab243e9befd91163b79d06.zip
ffmpeg-streaming-eaaa5801efec0888a5ab243e9befd91163b79d06.tar.gz
Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'
* commit '4d33873c2990b8d6096f60fef384f0efc4482b55': hevc: make pps/sps ids unsigned where necessary Conflicts: libavcodec/hevc.h libavcodec/hevc_ps.c See: d1e6602665d5ec1b7e211ab27b298c26139f82cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
-rw-r--r--libavcodec/hevc_ps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 97bd87e..647f83e 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -611,8 +611,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
{
const AVPixFmtDescriptor *desc;
GetBitContext *gb = &s->HEVClc->gb;
- int ret = 0;
- int sps_id = 0;
+ int ret = 0;
+ unsigned int sps_id = 0;
int log2_diff_max_min_transform_block_size;
int bit_depth_chroma, start, vui_present, sublayer_ordering_info;
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 log2_diff_ctb_min_tb_size;
int i, j, x, y, ctb_addr_rs, tile_id;
- int ret = 0;
- int pps_id = 0;
+ int ret = 0;
+ unsigned int pps_id = 0;
AVBufferRef *pps_buf;
HEVCPPS *pps = av_mallocz(sizeof(*pps));
OpenPOWER on IntegriCloud