Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' | Clément Bœsch | 2016-06-21 |
|\ | | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me> | ||
| * | cosmetics: Fix spelling mistakes | Vittorio Giovara | 2016-05-04 |
| | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> | ||
* | | Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb' | Michael Niedermayer | 2013-11-04 |
|/ | | | | | | | | | | | * 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> | ||
* | lavc: split slice and frame threading functions into separate files | Anton Khirnov | 2013-11-04 |