diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:05:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:05:52 +0100 |
| commit | 2a7cbc29a8aa0db2bcee95123a83c13d02f0f753 (patch) | |
| tree | 0abab39ac5ce26e567b57befb4bea6f9aa81112e /libavcodec/sipr16kdata.h | |
| parent | 4eea41cba1e1142060e53da2b2367a351d78c766 (diff) | |
| parent | daa7a1d4431b6acf1f93c4a98b3de123abf4ca18 (diff) | |
| download | ffmpeg-2a7cbc29a8aa0db2bcee95123a83c13d02f0f753.tar.gz | |
Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18'
* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
pthread_slice: rename ThreadContext -> SliceThreadContext
Conflicts:
libavcodec/pthread_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16kdata.h')
0 files changed, 0 insertions, 0 deletions