summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-06 00:56:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-06 01:34:08 +0200
commitaa61ca0c592b6169edf82990078579ada49a3332 (patch)
tree5eff589b0be2b0e7fb601b4efd0c3670a51dc371 /libavdevice
parentf428c29c23931620eafe692bede0773f66fe17e3 (diff)
parentd3f751e6030545c5e1f312c5a83c1e6ed5794f18 (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 'libavdevice')
-rw-r--r--libavdevice/libdc1394.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 20170877dc..dffb06ca1a 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "avdevice.h"