[FFmpeg-cvslog] Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
Michael Niedermayer
git at videolan.org
Mon Nov 4 11:05:02 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 4 10:44:34 2013 +0100| [4eea41cba1e1142060e53da2b2367a351d78c766] | committer: Michael Niedermayer
Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
lavc: split slice and frame threading functions into separate files
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eea41cba1e1142060e53da2b2367a351d78c766
---
More information about the ffmpeg-cvslog
mailing list