Commit 12bfb95f authored by David Schleef's avatar David Schleef
Browse files

configure.ac: Bump liboil requirement to 0.3.8.

Original commit message from CVS:
* configure.ac:
Bump liboil requirement to 0.3.8.
* gst-libs/gst/riff/riff-media.c:
Add Dirac fourcc.
* gst/videoscale/vs_image.h:
* gst/videoscale/vs_scanline.h:
Use liboil's stdint.h.
* gst/videotestsrc/videotestsrc.c:
Remove liboil related ifdef's, since they aren't needed now, and
won't work with future versions.
parent 25d874ec
2006-11-14 David Schleef <ds@schleef.org>
* configure.ac:
Bump liboil requirement to 0.3.8.
* gst-libs/gst/riff/riff-media.c:
Add Dirac fourcc.
* gst/videoscale/vs_image.h:
* gst/videoscale/vs_scanline.h:
Use liboil's stdint.h.
* gst/videotestsrc/videotestsrc.c:
Remove liboil related ifdef's, since they aren't needed now, and
won't work with future versions.
2006-11-14 David Schleef <ds@schleef.org>
 
* gst/videoscale/Makefile.am:
......@@ -215,10 +215,10 @@ dnl GLib is required
GST_GLIB_CHECK([2.6])
dnl liboil is required
PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.6, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
if test "x$HAVE_LIBOIL" != "xyes"
then
AC_ERROR([liboil-0.3.6 or later is required])
AC_ERROR([liboil-0.3.8 or later is required])
fi
dnl checks for gstreamer
......
......@@ -577,6 +577,12 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*codec_name = g_strdup ("VMWare NC Video");
break;
case GST_MAKE_FOURCC ('d', 'r', 'a', 'c'):
caps = gst_caps_new_simple ("video/x-dirac", NULL);
if (codec_name)
*codec_name = g_strdup ("Dirac");
break;
default:
GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (codec_fcc));
......
......@@ -28,7 +28,7 @@
#ifndef __VS_IMAGE_H__
#define __VS_IMAGE_H__
#include <stdint.h>
#include <liboil/liboil-stdint.h>
typedef struct _VSImage VSImage;
......
......@@ -28,7 +28,7 @@
#ifndef __VS_SCANLINE_H__
#define __VS_SCANLINE_H__
#include <stdint.h>
#include <liboil/liboil-stdint.h>
void vs_scanline_downsample_Y (uint8_t *dest, uint8_t *src, int n);
void vs_scanline_resample_nearest_Y (uint8_t *dest, uint8_t *src, int n, int *accumulator, int increment);
......
......@@ -916,7 +916,6 @@ paint_setup_I420 (paintinfo * p, unsigned char *dest)
static void
paint_hline_I420 (paintinfo * p, int x, int y, int w)
{
#ifdef oil_splat_u8_ns
int x1 = x / 2;
int x2 = (x + w) / 2;
int offset = y * p->ystride;
......@@ -925,7 +924,6 @@ paint_hline_I420 (paintinfo * p, int x, int y, int w)
oil_splat_u8_ns (p->yp + offset + x, &p->color->Y, w);
oil_splat_u8_ns (p->up + offset1 + x1, &p->color->U, x2 - x1);
oil_splat_u8_ns (p->vp + offset1 + x1, &p->color->V, x2 - x1);
#endif
}
static void
......@@ -1045,7 +1043,6 @@ paint_setup_Y41B (paintinfo * p, unsigned char *dest)
static void
paint_hline_Y41B (paintinfo * p, int x, int y, int w)
{
#ifdef oil_splat_u8_ns
int x1 = x / 4;
int x2 = (x + w) / 4;
int offset = y * p->ystride;
......@@ -1054,7 +1051,6 @@ paint_hline_Y41B (paintinfo * p, int x, int y, int w)
oil_splat_u8_ns (p->yp + offset + x, &p->color->Y, w);
oil_splat_u8_ns (p->up + offset1 + x1, &p->color->U, x2 - x1);
oil_splat_u8_ns (p->vp + offset1 + x1, &p->color->V, x2 - x1);
#endif
}
static void
......@@ -1072,7 +1068,6 @@ paint_setup_Y42B (paintinfo * p, unsigned char *dest)
static void
paint_hline_Y42B (paintinfo * p, int x, int y, int w)
{
#ifdef oil_splat_u8_ns
int x1 = x / 2;
int x2 = (x + w) / 2;
int offset = y * p->ystride;
......@@ -1081,7 +1076,6 @@ paint_hline_Y42B (paintinfo * p, int x, int y, int w)
oil_splat_u8_ns (p->yp + offset + x, &p->color->Y, w);
oil_splat_u8_ns (p->up + offset1 + x1, &p->color->U, x2 - x1);
oil_splat_u8_ns (p->vp + offset1 + x1, &p->color->V, x2 - x1);
#endif
}
static void
......@@ -1096,11 +1090,9 @@ paint_setup_Y800 (paintinfo * p, unsigned char *dest)
static void
paint_hline_Y800 (paintinfo * p, int x, int y, int w)
{
#ifdef oil_splat_u8_ns
int offset = y * p->ystride;
oil_splat_u8_ns (p->yp + offset + x, &p->color->Y, w);
#endif
}
#if 0
......@@ -1182,7 +1174,6 @@ paint_setup_YUV9 (paintinfo * p, unsigned char *dest)
static void
paint_hline_YUV9 (paintinfo * p, int x, int y, int w)
{
#ifdef oil_splat_u8_ns
int x1 = x / 4;
int x2 = (x + w) / 4;
int offset = y * p->ystride;
......@@ -1191,7 +1182,6 @@ paint_hline_YUV9 (paintinfo * p, int x, int y, int w)
oil_splat_u8_ns (p->yp + offset + x, &p->color->Y, w);
oil_splat_u8_ns (p->up + offset1 + x1, &p->color->U, x2 - x1);
oil_splat_u8_ns (p->vp + offset1 + x1, &p->color->V, x2 - x1);
#endif
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment