From 5397386effba2e53e4ff82852a86f6be4d59e9c1 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sat, 1 Mar 2014 13:01:43 +0100 Subject: mathops: move macro to the only place it is used This helps in disentangling lavf and lavc too. --- libavformat/mpegts.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libavformat/mpegts.c') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 5962592202..5a3561f588 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -28,7 +28,6 @@ #include "libavutil/opt.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" -#include "libavcodec/mathops.h" #include "avformat.h" #include "mpegts.h" #include "internal.h" @@ -45,6 +44,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, -- cgit v1.2.3