[FFmpeg-cvslog] Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

Michael Niedermayer git at videolan.org
Fri Oct 12 14:33:15 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 14:26:46 2012 +0200| [e335658370840390272b70de92f5a76860537fb9] | committer: Michael Niedermayer

Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
  Move avutil tables only used in libavcodec to libavcodec.

Conflicts:
	libavcodec/mathtables.c
	libavutil/intmath.h

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

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





More information about the ffmpeg-cvslog mailing list