diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/arm/fft_fixed_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/bit_depth_template.c (renamed from libavcodec/high_bit_depth.h) | 0 | ||||
| -rw-r--r-- | libavcodec/dsputil_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264dsp_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264idct_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264pred_template.c | 3 | ||||
| -rw-r--r-- | libavcodec/libopencore-amr.c | 2 | ||||
| -rw-r--r-- | libavcodec/ppc/fft_altivec.c | 6 | ||||
| -rw-r--r-- | libavdevice/libdc1394.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_frei0r.c | 1 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 1 | ||||
| -rw-r--r-- | libavformat/librtmp.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 1 |
14 files changed, 17 insertions, 9 deletions
@@ -3024,7 +3024,7 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,-rpath-link,libpostproc -Wl,-rpath-link,libswscale -Wl,-rpath-link,libavfilter -Wl,-rpath-link,libavdevice -Wl,-rpath-link,libavformat -Wl,-rpath-link,libavcodec -Wl,-rpath-link,libavutil +check_ldflags -Wl,-rpath-link=libpostproc:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic echo "X{};" > $TMPV diff --git a/libavcodec/arm/fft_fixed_neon.S b/libavcodec/arm/fft_fixed_neon.S index 565a9c0d20..0316b80bce 100644 --- a/libavcodec/arm/fft_fixed_neon.S +++ b/libavcodec/arm/fft_fixed_neon.S @@ -56,7 +56,7 @@ vhsub.s16 \r0, \d0, \d1 @ t3, t4, t8, t7 vhsub.s16 \r1, \d1, \d0 vhadd.s16 \d0, \d0, \d1 @ t1, t2, t6, t5 - vmov.i64 \d1, #0xffff<<32 + vmov.i64 \d1, #0xffff00000000 vbit \r0, \r1, \d1 vrev64.16 \r1, \r0 @ t7, t8, t4, t3 vtrn.32 \r0, \r1 @ t3, t4, t7, t8 diff --git a/libavcodec/high_bit_depth.h b/libavcodec/bit_depth_template.c index c0a6eafe89..c0a6eafe89 100644 --- a/libavcodec/high_bit_depth.h +++ b/libavcodec/bit_depth_template.c diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 58533d2ce9..5f7aa4fdc6 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -27,7 +27,7 @@ * DSP utils */ -#include "high_bit_depth.h" +#include "bit_depth_template.c" static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h) { diff --git a/libavcodec/h264dsp_template.c b/libavcodec/h264dsp_template.c index eb336f7e62..906d99f739 100644 --- a/libavcodec/h264dsp_template.c +++ b/libavcodec/h264dsp_template.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "high_bit_depth.h" +#include "bit_depth_template.c" #define op_scale1(x) block[x] = av_clip_pixel( (block[x]*weight + offset) >> log2_denom ) #define op_scale2(x) dst[x] = av_clip_pixel( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1)) diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c index d198c10c5c..94d073ef30 100644 --- a/libavcodec/h264idct_template.c +++ b/libavcodec/h264idct_template.c @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#include "high_bit_depth.h" +#include "bit_depth_template.c" #ifndef AVCODEC_H264IDCT_INTERNAL_H #define AVCODEC_H264IDCT_INTERNAL_H diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c index 3cd4463d76..36f6d4e12f 100644 --- a/libavcodec/h264pred_template.c +++ b/libavcodec/h264pred_template.c @@ -26,7 +26,8 @@ */ #include "mathops.h" -#include "high_bit_depth.h" + +#include "bit_depth_template.c" static void FUNCC(pred4x4_vertical)(uint8_t *_src, const uint8_t *topright, int _stride){ pixel *src = (pixel*)_src; diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 73abd758a1..31d1462e23 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -88,7 +88,7 @@ typedef struct AMRContext { } AMRContext; static const AVOption options[] = { - { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), FF_OPT_TYPE_INT, { 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, { NULL } }; diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_altivec.c index 1ea2369f55..e171665b37 100644 --- a/libavcodec/ppc/fft_altivec.c +++ b/libavcodec/ppc/fft_altivec.c @@ -141,7 +141,9 @@ av_cold void ff_fft_init_altivec(FFTContext *s) { #if HAVE_GNU_AS s->fft_calc = ff_fft_calc_interleave_altivec; - s->imdct_calc = ff_imdct_calc_altivec; - s->imdct_half = ff_imdct_half_altivec; + if (s->mdct_bits >= 5) { + s->imdct_calc = ff_imdct_calc_altivec; + s->imdct_half = ff_imdct_half_altivec; + } #endif } 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" diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index ab1957089e..f5b7abb543 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -28,6 +28,7 @@ #include <frei0r.h> #include "libavutil/avstring.h" #include "libavutil/imgutils.h" +#include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "avfilter.h" 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" |