diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:31 +0100 |
| commit | 03ae616b194e873ce22cef1878666b9d3028e56f (patch) | |
| tree | fb1913ef33b54556b70a3af911fbe7fd4cff290a | |
| parent | 830c3058ff468bc2298c3be26917a08d089a77ff (diff) | |
| parent | fa6b99d351ed483766a875054676a56fd8459774 (diff) | |
| download | ffmpeg-03ae616b194e873ce22cef1878666b9d3028e56f.tar.gz | |
Merge commit 'fa6b99d351ed483766a875054676a56fd8459774' into release/2.2
* commit 'fa6b99d351ed483766a875054676a56fd8459774':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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); |