[FFmpeg-cvslog] Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'
Michael Niedermayer
git at videolan.org
Mon Feb 16 02:55:23 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 16 02:40:26 2015 +0100| [815daf1607b0dc5e471a0de1132767f60c8a6fd2] | committer: Michael Niedermayer
Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'
* commit '3a651f599a18b023602370b67a77eb0efa309b20':
dca: Move data tables from a header to an object file
Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=815daf1607b0dc5e471a0de1132767f60c8a6fd2
---
More information about the ffmpeg-cvslog
mailing list