diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 04:47:53 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 04:58:08 +0400 |
| commit | 7e19c549bafa9e4025d0adc59593f6541ccbe304 (patch) | |
| tree | 2399ce6d837cb3aa22060d1bc839ed82c7a5a5f3 /ffplay.c | |
| parent | 8c508a0354283867984f8bbb3a013b296de67f6b (diff) | |
| parent | 4e326ec76991667c3cb0130c423e9818ad7f2a20 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: aac: Add test for AAC-ELD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions