Commit 06219db9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ed06e5d9'

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

Conflicts:
	libavcodec/hevc.c

See: bf2ce19eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 26568c04 ed06e5d9
......@@ -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