diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:49:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:49:00 +0200 |
| commit | 36d349034e19e111cc43de7a0e5749f8235b3bf9 (patch) | |
| tree | 1806d2f1e7c53f6f0334666d0b48b4b21181095b /libavcodec/atrac.c | |
| parent | 1e9a050bc020825094684ba27fc28025bf0a8088 (diff) | |
| parent | 30e256430eb88c6d4c382581b89bca171d79fbc0 (diff) | |
| download | ffmpeg-36d349034e19e111cc43de7a0e5749f8235b3bf9.tar.gz | |
Merge commit '30e256430eb88c6d4c382581b89bca171d79fbc0'
* commit '30e256430eb88c6d4c382581b89bca171d79fbc0':
lavc/pthread: remove obsolete checks
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac.c')
0 files changed, 0 insertions, 0 deletions