ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jun 2
19:14:40 2015 +0200| [2a339720309352cd685237dd809d1ad2bb1369f1] | committer:
Michael Niedermayer
Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
configure: Use pkg-config for fdk-aac
Conflicts:
configure
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a339720309352cd685237dd809d1ad2bb1369f1
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
