diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/divx/gstdivxdec.c | 8 | ||||
| -rw-r--r-- | ext/xvid/gstxvid.c | 8 |
3 files changed, 20 insertions, 4 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index ec6955bb..a5e112cb 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -154,6 +154,12 @@ else LCS_DIR= endif +if USE_LIBCACA +LIBCACA_DIR=libcaca +else +LIBCACA_DIR= +endif + if USE_LIBDV LIBDV_DIR=dv else @@ -323,6 +329,7 @@ SUBDIRS=\ $(LADSPA_DIR) \ $(LAME_DIR) \ $(LCS_DIR) \ + $(LIBCACA_DIR) \ $(LIBDV_DIR) \ $(LIBFAME_DIR) \ $(LIBPNG_DIR) \ @@ -376,6 +383,7 @@ DIST_SUBDIRS=\ ladspa \ lame \ lcs \ + libcaca \ libfame \ libpng \ librfb \ diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index a61466c7..bd9deb8d 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -369,11 +369,15 @@ gst_divxdec_negotiate (GstDivxDec *divxdec) break; case 24: endianness = G_BIG_ENDIAN; - r_mask = R_MASK_24; g_mask = G_MASK_24; b_mask = B_MASK_24; + r_mask = GST_VIDEO_BYTE1_MASK_24_INT; + g_mask = GST_VIDEO_BYTE2_MASK_24_INT; + b_mask = GST_VIDEO_BYTE3_MASK_24_INT break; case 32: endianness = G_BIG_ENDIAN; - r_mask = R_MASK_32; g_mask = G_MASK_32; b_mask = B_MASK_32; + r_mask = GST_VIDEO_BYTE1_MASK_32_INT; + g_mask = GST_VIDEO_BYTE2_MASK_32_INT; + b_mask = GST_VIDEO_BYTE3_MASK_32_INT break; } caps = GST_CAPS_NEW("divxdec_src_pad_rgb", diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c index 49d2ecb3..a8060fb6 100644 --- a/ext/xvid/gstxvid.c +++ b/ext/xvid/gstxvid.c @@ -196,11 +196,15 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps) switch (csp) { case XVID_CSP_RGB555: - r_mask = R_MASK_15_INT; g_mask = G_MASK_15_INT; b_mask = B_MASK_15_INT; + r_mask = GST_VIDEO_RED_MASK_15_INT; + g_mask = GST_VIDEO_GREEN_MASK_15_INT; + b_mask = GST_VIDEO_BLUE_MASK_15_INT; endianness = G_BYTE_ORDER; depth = 15; bpp = 16; break; case XVID_CSP_RGB565: - r_mask = R_MASK_16_INT; g_mask = G_MASK_16_INT; b_mask = B_MASK_16_INT; + r_mask = GST_VIDEO_RED_MASK_16_INT; + g_mask = GST_VIDEO_GREEN_MASK_16_INT; + b_mask = GST_VIDEO_BLUE_MASK_16_INT; endianness = G_BYTE_ORDER; depth = 16; bpp = 16; break; case XVID_CSP_BGR: |