41ed7ab45f
* commit '41ed7ab45f': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
cc14ee03a7
* commit 'cc14ee03a7': lavc: split slice and frame threading functions into separate files Conflicts: libavcodec/Makefile libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>