changeset 8233:ababfa151ced libavcodec

enable RV40 decoder
author kostya
date Mon, 01 Dec 2008 06:40:36 +0000
parents 520a6e56b8c0
children 4a8f9bbc5e81
files Makefile allcodecs.c avcodec.h dsputil.h
diffstat 4 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Dec 01 06:36:22 2008 +0000
+++ b/Makefile	Mon Dec 01 06:40:36 2008 +0000
@@ -177,6 +177,7 @@
 OBJS-$(CONFIG_RV10_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_RV20_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_RV20_ENCODER)            += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o h264pred.o rv40dsp.o
 OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
 OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o
 OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.o
--- a/allcodecs.c	Mon Dec 01 06:36:22 2008 +0000
+++ b/allcodecs.c	Mon Dec 01 06:40:36 2008 +0000
@@ -142,6 +142,7 @@
     REGISTER_DECODER (RPZA, rpza);
     REGISTER_ENCDEC  (RV10, rv10);
     REGISTER_ENCDEC  (RV20, rv20);
+    REGISTER_DECODER (RV40, rv40);
     REGISTER_ENCDEC  (SGI, sgi);
     REGISTER_DECODER (SMACKER, smacker);
     REGISTER_DECODER (SMC, smc);
--- a/avcodec.h	Mon Dec 01 06:36:22 2008 +0000
+++ b/avcodec.h	Mon Dec 01 06:40:36 2008 +0000
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR  4
+#define LIBAVCODEC_VERSION_MINOR  5
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
--- a/dsputil.h	Mon Dec 01 06:36:22 2008 +0000
+++ b/dsputil.h	Mon Dec 01 06:40:36 2008 +0000
@@ -485,6 +485,10 @@
      */
     int32_t (*scalarproduct_int16)(int16_t *v1, int16_t *v2/*align 16*/, int len, int shift);
 
+    /* rv30 functions */
+    qpel_mc_func put_rv30_tpel_pixels_tab[4][16];
+    qpel_mc_func avg_rv30_tpel_pixels_tab[4][16];
+
     /* rv40 functions */
     qpel_mc_func put_rv40_qpel_pixels_tab[4][16];
     qpel_mc_func avg_rv40_qpel_pixels_tab[4][16];