enable RV40 decoder

Originally committed as revision 15968 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index 74c9a1782b3a21eb78f280f914b65509cdc31818..dd1b8472ef37b10a599b79e67b20b26af9cc92d8 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -140,6 +140,7 @@ version <next>
 - liba52 wrapper removed
 - Speex decoding via libspeex
 - Electronic Arts TGQ decoder
+- RV40 decoder
 
 version 0.4.9-pre1:
 

diff --git a/doc/general.texi b/doc/general.texi
index 1db8e4a441d9cf23ce69e078b1bf042ded46405f..140338deed9a709bb13c5c448f231c0e8948aa2d 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -288,6 +288,7 @@ following image formats are supported:
     @tab fourccs: QPEG, Q1.0, Q1.1
 @item RealVideo 1.0          @tab  X  @tab  X
 @item RealVideo 2.0          @tab  X  @tab  X
+@item RealVideo 4.0          @tab     @tab  X
 @item Renderware TXD         @tab     @tab  X
     @tab Texture dictionaries used by the Renderware Engine.
 @item RTjpeg                 @tab     @tab  X

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0105a4941c4d1f7d15af617fc87744e4a7f2aff9..425066cbf259aae1365307a6431299cd5bc62630 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -177,6 +177,7 @@ OBJS-$(CONFIG_RV10_DECODER)            += rv10.o h263.o mpeg12data.o mpegvideo.o
 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

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index f8f7a71cda4bb83fc75aa89e76aaaf2ec405a990..6880d00994324fc36db178721feac7911f79e99e 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -142,6 +142,7 @@ void avcodec_register_all(void)
     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);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f5425e562c7cbbd31824c26ac0382c75ba0db898..53ded30274f8f6a7b28f358aaec446a5166a9967 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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, \

diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 17cec215dbb5890d319a6f111a88df31c2d4f719..66a46d72a756f45cc33333c018c6195377e12b3e 100644 (file)
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -485,6 +485,10 @@ typedef struct DSPContext {
      */
     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];