highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'fa6b99d351ed483766a875054676a56fd8459774' into release/2.2

Browse Source 
* commit 'fa6b99d351ed483766a875054676a56fd8459774':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-11 11:39:31 +01:00
parent 830c3058ff fa6b99d351
commit 03ae616b19
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hevc.c
View File

@@ -283,7 +283,7 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb)
static int set_sps(HEVCContext *s, const HEVCSPS *sps) static int set_sps(HEVCContext *s, const HEVCSPS *sps)
{ {
int ret; int ret;
unsigned num = 0, den = 0; unsigned int num = 0, den = 0;
pic_arrays_free(s); pic_arrays_free(s);
ret = pic_arrays_init(s, sps); ret = pic_arrays_init(s, sps);