diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 22:38:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 22:38:05 +0100 |
| commit | 0efacc7f9a36821ab0fee42c8c12322c03263444 (patch) | |
| tree | a867e0c80c645e124547ec00f4fb70b88f294bf4 /libswscale/x86/swscale.c | |
| parent | 6dd007ad99f9fad84c3e50d09ded676fef48b9b0 (diff) | |
| parent | 3b1c9eb0ffb680174ffaebb47b773a4628a2be6a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Lower the number of frames required to detect ADTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/swscale.c')
0 files changed, 0 insertions, 0 deletions