Browse Source

mathops: move macro to the only place it is used

This helps in disentangling lavf and lavc too.
tags/n2.3
Vittorio Giovara 11 years ago
parent
commit
5397386eff
2 changed files with 7 additions and 10 deletions
  1. +0
    -9
      libavcodec/mathops.h
  2. +7
    -1
      libavformat/mpegts.c

+ 0
- 9
libavcodec/mathops.h View File

@@ -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;


+ 7
- 1
libavformat/mpegts.c View File

@@ -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,


Loading…
Cancel
Save