[FFmpeg-cvslog] Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
Michael Niedermayer
git at videolan.org
Mon Apr 20 05:18:48 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 05:09:47 2015 +0200| [1fa7d0902c3eef6fc17f253b5e90c77167483458] | committer: Michael Niedermayer
Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
hqx: Implement slice-threaded decoding
Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h
See: eff72a6c7375587a3280ddf59e6e26a4907823b7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fa7d0902c3eef6fc17f253b5e90c77167483458
---
More information about the ffmpeg-cvslog
mailing list