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 /libavutil | |
| 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 'libavutil')
| -rw-r--r-- | libavutil/intmath.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavutil/intmath.h b/libavutil/intmath.h index 0feedf8cfd..9cba406abd 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -50,11 +50,7 @@ extern const uint32_t ff_inverse[257]; #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */ #ifndef FASTDIV -# if CONFIG_FASTDIV -# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) -# else -# define FASTDIV(a,b) ((a) / (b)) -# endif +# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) #endif /* FASTDIV */ #include "common.h" |