diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 00:15:55 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 00:16:33 +0400 |
| commit | 06219db9351cc2862913edb486ecc1573523502d (patch) | |
| tree | e70af13e4d6aa52de3ac52c21f302a4ddb832c1b /libavcodec/hevc.c | |
| parent | 26568c04a8270ad792f3b86223914095b178b3a8 (diff) | |
| parent | ed06e5d92b4c67b49068d538461fbbe0a53a8c5e (diff) | |
Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 2c7a6312d0..4aa1e55393 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -283,7 +283,7 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb) static int set_sps(HEVCContext *s, const HEVCSPS *sps) { int ret; - unsigned num = 0, den = 0; + unsigned int num = 0, den = 0; pic_arrays_free(s); ret = pic_arrays_init(s, sps); |