diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:07:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:07:36 +0100 |
| commit | cd88d89493d3988c990d815e9b2a9b8c3a5f6743 (patch) | |
| tree | 3e5a19c2f8e3176eddfe278e9a50d7733b83d788 /libavcodec/libx264.c | |
| parent | 80793afb177ebfbc2d68327d2ca0380acc734cba (diff) | |
| parent | fb3b2f5d923a6e19d80f21eb4e081674bceec810 (diff) | |
| download | ffmpeg-cd88d89493d3988c990d815e9b2a9b8c3a5f6743.tar.gz | |
Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'
* commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810':
configure: Set the thread type after resolving dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
0 files changed, 0 insertions, 0 deletions