ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89c35b113060a00bc57ee67c5ebc29ea500d5160
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
