Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 09:44:34 +0000 (10:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 09:44:34 +0000 (10:44 +0100)
commit4eea41cba1e1142060e53da2b2367a351d78c766
tree7a09b24e99c866d63fbd057fb8a7d7be93e5e437
parent3d4dc43259e2f58e7f55f2152094a1ee4333bfd2
parentcc14ee03a7b91c69343f8d60c9e089a1950eeadb
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@gmx.at>
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/pthread_frame.c
libavcodec/pthread_internal.h
libavcodec/pthread_slice.c