diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 15:00:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 15:00:53 +0100 |
| commit | f385a099c1999b9d9583324b2a3bb2b6bc98b4a1 (patch) | |
| tree | 4356c93009f6d46fb453e19b9ce184f52e89f088 /libavformat/g722.c | |
| parent | bb6de15d927dcbc5175387fdbb2c066243c1c6b4 (diff) | |
| parent | aac9e56759350e5466afb025c434c435c9ebb125 (diff) | |
| download | ffmpeg-f385a099c1999b9d9583324b2a3bb2b6bc98b4a1.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix hardware detection on aix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g722.c')
0 files changed, 0 insertions, 0 deletions