diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 00:56:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 01:34:08 +0200 |
| commit | aa61ca0c592b6169edf82990078579ada49a3332 (patch) | |
| tree | 5eff589b0be2b0e7fb601b4efd0c3670a51dc371 /libavformat | |
| parent | f428c29c23931620eafe692bede0773f66fe17e3 (diff) | |
| parent | d3f751e6030545c5e1f312c5a83c1e6ed5794f18 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add some missing mathematics.h #includes for av_rescale().
opencore-amr: Add missing initializer braces to shut up gcc warning.
ARM: workaround for bug in GNU assembler
dv: fix comment wording mistake
Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c
dv: fix valgrind use of uninitialised value warnings.
mxfenc: fix ignored drop flag in binary timecode representation.
PPC: use Altivec IMDCT only for supported sizes
dv: fix comment spelling
configure: simplify -rpath-link linker flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 1 | ||||
| -rw-r--r-- | libavformat/librtmp.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 6d0f7d0cdc..7f4b87f81d 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -27,6 +27,7 @@ #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index acc4503d89..01b6c3deb0 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -24,6 +24,7 @@ * RTMP protocol based on http://rtmpdump.mplayerhq.hu/ librtmp */ +#include "libavutil/mathematics.h" #include "avformat.h" #include "url.h" diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ad3cd824f4..be558221f2 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -25,6 +25,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavcodec/bytestream.h" #include "avformat.h" |