aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-10 11:38:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-10 11:38:49 +0100
commita602f88e2dea56b85056d5e528172c4f45c69c6f (patch)
tree7ec3051bdfe8c7f3bc191cf8c14a39d6f0d878a8 /Makefile
parenta7d451c1dd754c6345dfaa0d2416f1adba20ef08 (diff)
parent28396d17ff1c1493b78d6eece484ffc27ed86d0d (diff)
downloadffmpeg-a602f88e2dea56b85056d5e528172c4f45c69c6f.tar.gz
Merge commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d'
* commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d': libfdk-aacdec: Support building with the latest version of fdk-aac See: b44a242c3dfa1225ca4e75135ed5fbe7f0e3c378 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions