Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 12:37:58 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 12:38:04 +0000 (13:38 +0100)
* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
  mathops: move macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mathops.h
libavformat/mpegts.c

Simple merge
  #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"