diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:44:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 21:44:40 +0100 |
| commit | eaaa5801efec0888a5ab243e9befd91163b79d06 (patch) | |
| tree | c60def7308f8fe751d19f68c82e25792245edd31 /libavcodec/hevc.h | |
| parent | 06219db9351cc2862913edb486ecc1573523502d (diff) | |
| parent | 4d33873c2990b8d6096f60fef384f0efc4482b55 (diff) | |
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.h')
| -rw-r--r-- | libavcodec/hevc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index fe9c4e90e0..4a6620f67b 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -461,7 +461,7 @@ typedef struct HEVCSPS { } HEVCSPS; typedef struct HEVCPPS { - unsigned sps_id; ///< seq_parameter_set_id + unsigned int sps_id; ///< seq_parameter_set_id uint8_t sign_data_hiding_flag; |