Commit 03ae616b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'fa6b99d3' into release/2.2

* commit 'fa6b99d3':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 830c3058 fa6b99d3
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment