Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'

* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
  mathops: move macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/mathops.h
Simple merge

diff --cc libavformat/mpegts.c
index 242d353,5a3561f..10b33fe
--- 1/libavformat/mpegts.c
--- 2/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@@ -26,10 -26,8 +26,9 @@@
  #include "libavutil/dict.h"
  #include "libavutil/mathematics.h"
  #include "libavutil/opt.h"
 +#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"