[FFmpeg-cvslog] Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
Michael Niedermayer
git at videolan.org
Mon Apr 20 05:51:51 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 05:28:13 2015 +0200| [5a284d076ffdca705204e3e4100917cd4dbda14c] | committer: Michael Niedermayer
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a284d076ffdca705204e3e4100917cd4dbda14c
---
More information about the ffmpeg-cvslog
mailing list