[FFmpeg-cvslog] Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'
Michael Niedermayer
git at videolan.org
Fri Feb 14 21:57:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 21:49:52 2014 +0100| [e136579ca358093caa6b0a4941717ae7ef1f90b2] | committer: Michael Niedermayer
Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'
* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
utvideoenc: Enable support for multiple slices and use them
Conflicts:
libavcodec/utvideoenc.c
tests/fate/utvideo.mak
See: efec857c9f70113bdbcc18e03a5bcadcdca9f9a1
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e136579ca358093caa6b0a4941717ae7ef1f90b2
---
More information about the ffmpeg-cvslog
mailing list