[FFmpeg-cvslog] Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
Michael Niedermayer
git at videolan.org
Mon Apr 20 04:40:03 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 04:33:06 2015 +0200| [d8b4e9adbb93211b511e3864d8230789186ef4ed] | committer: Michael Niedermayer
Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
hqx: Move DSP related code to a separate file
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8b4e9adbb93211b511e3864d8230789186ef4ed
---
More information about the ffmpeg-cvslog
mailing list