Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:05:52 +0000 (11:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:05:52 +0000 (11:05 +0100)
commit2a7cbc29a8aa0db2bcee95123a83c13d02f0f753
tree0abab39ac5ce26e567b57befb4bea6f9aa81112e
parent4eea41cba1e1142060e53da2b2367a351d78c766
parentdaa7a1d4431b6acf1f93c4a98b3de123abf4ca18
Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'

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

Conflicts:
libavcodec/pthread_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pthread_slice.c