diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 14:34:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 14:34:18 +0100 |
| commit | 911e2706884020caf8b9b8ca67a2ad3801f067f4 (patch) | |
| tree | 7ba99b5be6270aaeffab8bf53deae8cc7d93cdd9 /libavcodec | |
| parent | 1bc51a7a74fc1ae005a70af36c9f01b7b8463994 (diff) | |
| parent | 6c1a7d07eb41b4cf36e48ebb560fecd9504fd968 (diff) | |
| download | ffmpeg-911e2706884020caf8b9b8ca67a2ad3801f067f4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/videodsp_init_armv5te.c | 2 | ||||
| -rw-r--r-- | libavcodec/kbdwin.c | 5 | ||||
| -rw-r--r-- | libavcodec/ppc/fmtconvert_altivec.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/arm/videodsp_init_armv5te.c b/libavcodec/arm/videodsp_init_armv5te.c index c6ca1146ea..d11a07061b 100644 --- a/libavcodec/arm/videodsp_init_armv5te.c +++ b/libavcodec/arm/videodsp_init_armv5te.c @@ -19,7 +19,7 @@ */ #include "libavutil/arm/cpu.h" -#include <libavcodec/videodsp.h> +#include "libavcodec/videodsp.h" #include "videodsp_arm.h" void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h); diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c index 2722312f11..5a62e9da2b 100644 --- a/libavcodec/kbdwin.c +++ b/libavcodec/kbdwin.c @@ -16,9 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - -#include <libavutil/avassert.h> -#include <libavutil/mathematics.h> +#include "libavutil/avassert.h" +#include "libavutil/mathematics.h" #include "libavutil/attributes.h" #include "kbdwin.h" diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index d40ce07583..740614d335 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -93,7 +93,7 @@ static void float_to_int16_stride_altivec(int16_t *dst, const float *src, long len, int stride) { int i; - vector signed short d, s; + vector signed short d; for (i = 0; i < len - 7; i += 8) { d = float_to_int16_one_altivec(src + i); |