diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 00:55:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 00:55:29 +0100 |
| commit | 1a5e8511d4ed8778ada6db05d6f24c38a9e15825 (patch) | |
| tree | a5bd676ccbe853718633b4d2b39d5465d48db2ff /libavcodec/wma_common.h | |
| parent | b80073c05f7ca1136d397a3875cafdda40d25667 (diff) | |
| parent | cfc36666f681c41096ee8293f1f47cee1fe58284 (diff) | |
| download | ffmpeg-1a5e8511d4ed8778ada6db05d6f24c38a9e15825.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma_common.h')
0 files changed, 0 insertions, 0 deletions