diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 14:23:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 14:23:46 +0200 |
| commit | fac292b8cd4b1374471f0ab2900cdd242de3d1ef (patch) | |
| tree | ddbf78c493a4f446a048ff3d670f36d1c96bb699 /libavcodec/atrac3.c | |
| parent | 491c52d3b077dc1f298322a719059398a5f76af8 (diff) | |
| parent | 23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac (diff) | |
| download | ffmpeg-fac292b8cd4b1374471f0ab2900cdd242de3d1ef.tar.gz | |
Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'
* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac':
fate: explicitly set the default THREADS value
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3.c')
0 files changed, 0 insertions, 0 deletions