diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 13:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 13:39:32 +0200 |
| commit | e8fc91e22a608eecccdeb612f91a0998e486426d (patch) | |
| tree | 6651a99cc870f10954a0f87f99f1f9689175c627 /libavformat/vocdec.c | |
| parent | f45a840907c26d77e6d20880d07dedc0f4af44c3 (diff) | |
| parent | 4936ef6492f640e1606c6507f2c4e495164d3974 (diff) | |
| download | ffmpeg-e8fc91e22a608eecccdeb612f91a0998e486426d.tar.gz | |
Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'
* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
configure: Handle armcc 5.0
Conflicts:
configure
See: db55365d0f938ee93ed660a14c07f10f2a66dd10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vocdec.c')
0 files changed, 0 insertions, 0 deletions