[FFmpeg-cvslog] Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
Michael Niedermayer
git at videolan.org
Sun Mar 9 21:41:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 9 21:15:55 2014 +0100| [06219db9351cc2862913edb486ecc1573523502d] | committer: Michael Niedermayer
Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06219db9351cc2862913edb486ecc1573523502d
---
More information about the ffmpeg-cvslog
mailing list