diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 13:37:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 13:38:04 +0100 |
| commit | 8cc581fbf77ac25deb9eb9398cf4c759857aaeaa (patch) | |
| tree | ef3fd07d5f9cce27727c7e3b11ebbcf890630b9d | |
| parent | d63b032d64e96f108c1524514898eafb4144e183 (diff) | |
| parent | 5397386effba2e53e4ff82852a86f6be4d59e9c1 (diff) | |
| download | ffmpeg-8cc581fbf77ac25deb9eb9398cf4c759857aaeaa.tar.gz | |
Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'
* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
mathops: move macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mathops.h | 9 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index bad25afd45..cc8ce557cc 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -195,15 +195,6 @@ if ((y) < (x)) {\ # define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) #endif /* FASTDIV */ -#ifndef MOD_UNLIKELY -# define MOD_UNLIKELY(modulus, dividend, divisor, prev_dividend) \ - do { \ - if ((prev_dividend) == 0 || (dividend) - (prev_dividend) != (divisor)) \ - (modulus) = (dividend) % (divisor); \ - (prev_dividend) = (dividend); \ - } while (0) -#endif - static inline av_const unsigned int ff_sqrt(unsigned int a) { unsigned int b; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 242d353399..10b33fe1dd 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -29,7 +29,6 @@ #include "libavutil/avassert.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" -#include "libavcodec/mathops.h" #include "avformat.h" #include "mpegts.h" #include "internal.h" @@ -46,6 +45,13 @@ #define MAX_MP4_DESCR_COUNT 16 +#define MOD_UNLIKELY(modulus, dividend, divisor, prev_dividend) \ + do { \ + if ((prev_dividend) == 0 || (dividend) - (prev_dividend) != (divisor)) \ + (modulus) = (dividend) % (divisor); \ + (prev_dividend) = (dividend); \ + } while (0) + enum MpegTSFilterType { MPEGTS_PES, MPEGTS_SECTION, |