diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:14:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:31:22 +0200 |
| commit | 2a339720309352cd685237dd809d1ad2bb1369f1 (patch) | |
| tree | aacd7b36fd345d955454598d282f5c9fe98a644c /libavresample | |
| parent | f939bf58b22896fadfcfadaddb9c222a86e7ecfa (diff) | |
| parent | fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d (diff) | |
| download | ffmpeg-2a339720309352cd685237dd809d1ad2bb1369f1.tar.gz | |
Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
configure: Use pkg-config for fdk-aac
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions