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)
commit8cc581fbf77ac25deb9eb9398cf4c759857aaeaa
treeef3fd07d5f9cce27727c7e3b11ebbcf890630b9d
parentd63b032d64e96f108c1524514898eafb4144e183
parent5397386effba2e53e4ff82852a86f6be4d59e9c1
Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'

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

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