[FFmpeg-cvslog] Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 11:05:52 2013 +0100| [2a7cbc29a8aa0db2bcee95123a83c13d02f0f753] | committer: Michael Niedermayer

Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
  pthread_slice: rename ThreadContext -> SliceThreadContext

Conflicts:
	libavcodec/pthread_slice.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a7cbc29a8aa0db2bcee95123a83c13d02f0f753
---