[FFmpeg-cvslog] Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'

Michael Niedermayer git at videolan.org
Thu Jan 29 22:41:29 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 22:34:54 2015 +0100| [89c35b113060a00bc57ee67c5ebc29ea500d5160] | committer: Michael Niedermayer

Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'

* commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1':
  flacenc: initialize sums matrix

Conflicts:
	libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore

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

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





More information about the ffmpeg-cvslog mailing list