[FFmpeg-cvslog] Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
Michael Niedermayer
git at videolan.org
Fri Jul 26 11:08:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 26 10:57:51 2013 +0200| [5dc2c99055ae4a95336f28c58c8c8da4033979f1] | committer: Michael Niedermayer
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
mpeg12: Ignore slice threading if hwaccel is active
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dc2c99055ae4a95336f28c58c8c8da4033979f1
---
More information about the ffmpeg-cvslog
mailing list