diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-22 14:37:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-22 14:37:03 +0200 |
| commit | 36999606902ce5c53636552ec46df5a38fd3bd6b (patch) | |
| tree | c081b062a579c147efab57f8eaab5f283be085df /Makefile | |
| parent | a7219529d1b872f6a8e36788de44aa3ab0a7b05e (diff) | |
| parent | 6fa488678f39fe45abe898fd7ef457849d0a8d99 (diff) | |
| download | ffmpeg-36999606902ce5c53636552ec46df5a38fd3bd6b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: x86: Only compile mpegvideo optimizations when necessary
configure: Drop fastdiv option
build: Make the E-AC-3 encoder select the AC-3 encoder
fate: flac: Only run tests requiring samples when samples are available
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions