[FFmpeg-cvslog] Merge commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0'

Michael Niedermayer git at videolan.org
Sat Jan 4 01:34:57 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 01:18:33 2014 +0100| [3929c17405e010896e56b7791084ffd9fcee3a3d] | committer: Michael Niedermayer

Merge commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0'

* commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0':
  mathematics: remove asserts from av_rescale_rnd()

Conflicts:
	libavutil/mathematics.c

The asserts are left in place for now as no code checks the return
value, but we sure can change this if application developers
prefer

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list