[FFmpeg-cvslog] Merge commit 'fa6b99d351ed483766a875054676a56fd8459774' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 11:57:14 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:39:31 2014 +0100| [03ae616b194e873ce22cef1878666b9d3028e56f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03ae616b194e873ce22cef1878666b9d3028e56f
---





More information about the ffmpeg-cvslog mailing list