aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-25 01:56:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-25 01:56:23 +0200
commite148a5820dc5e7077f519d091b5e1ff2a5b23665 (patch)
tree451f39876420d8b1fd8faa0e15f8ae0f349955cc /libavfilter
parent817627d925384a55dd04d3427b4791e04bb98899 (diff)
parent18e7e21e2fb151d9dc01b6131b58dfc00715a69b (diff)
downloadffmpeg-e148a5820dc5e7077f519d091b5e1ff2a5b23665.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Enable muxing ac-3 in caf. Use correct msvc type specifiers for ptrdiff_t and size_t. Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS. Fix libpostproc compilation with !HAVE_6REGS. Never write 0 as maximum bitrate for asf files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/libmpcodecs/vf_eq.c4
-rw-r--r--libavfilter/libmpcodecs/vf_eq2.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/libmpcodecs/vf_eq.c b/libavfilter/libmpcodecs/vf_eq.c
index c926c51804..f8efa846c9 100644
--- a/libavfilter/libmpcodecs/vf_eq.c
+++ b/libavfilter/libmpcodecs/vf_eq.c
@@ -37,7 +37,7 @@ struct vf_priv_s {
int contrast;
};
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_6REGS
static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, int sstride,
int w, int h, int brightness, int contrast)
{
@@ -224,7 +224,7 @@ static int vf_open(vf_instance_t *vf, char *args)
if (args) sscanf(args, "%d:%d", &vf->priv->brightness, &vf->priv->contrast);
process = process_C;
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_6REGS
if(ff_gCpuCaps.hasMMX) process = process_MMX;
#endif
diff --git a/libavfilter/libmpcodecs/vf_eq2.c b/libavfilter/libmpcodecs/vf_eq2.c
index 7a3ef312aa..c9c3ff69f4 100644
--- a/libavfilter/libmpcodecs/vf_eq2.c
+++ b/libavfilter/libmpcodecs/vf_eq2.c
@@ -120,7 +120,7 @@ void create_lut (eq2_param_t *par)
par->lut_clean = 1;
}
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_6REGS
static
void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src,
unsigned w, unsigned h, unsigned dstride, unsigned sstride)
@@ -289,7 +289,7 @@ void check_values (eq2_param_t *par)
if ((par->c == 1.0) && (par->b == 0.0) && (par->g == 1.0)) {
par->adjust = NULL;
}
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_6REGS
else if (par->g == 1.0 && ff_gCpuCaps.hasMMX) {
par->adjust = &affine_1d_MMX;
}