# HG changeset patch
# User kostya
# Date 1229796361 0
# Node ID b0ec9768b39b6f4586dd630a98a75f2ff26e7b88
# Parent  51c9946c70f9a0a10f2e593e0749ae4c8b979a07
RV30 decoder

diff -r 51c9946c70f9 -r b0ec9768b39b Makefile
--- a/Makefile	Sat Dec 20 06:09:54 2008 +0000
+++ b/Makefile	Sat Dec 20 18:06:01 2008 +0000
@@ -178,6 +178,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_RV30_DECODER)            += rv30.o rv34.o h264pred.o rv30dsp.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
diff -r 51c9946c70f9 -r b0ec9768b39b allcodecs.c
--- a/allcodecs.c	Sat Dec 20 06:09:54 2008 +0000
+++ b/allcodecs.c	Sat Dec 20 18:06:01 2008 +0000
@@ -132,6 +132,7 @@
     REGISTER_DECODER (RPZA, rpza);
     REGISTER_ENCDEC  (RV10, rv10);
     REGISTER_ENCDEC  (RV20, rv20);
+    REGISTER_DECODER (RV30, rv30);
     REGISTER_DECODER (RV40, rv40);
     REGISTER_ENCDEC  (SGI, sgi);
     REGISTER_DECODER (SMACKER, smacker);
diff -r 51c9946c70f9 -r b0ec9768b39b avcodec.h
--- a/avcodec.h	Sat Dec 20 06:09:54 2008 +0000
+++ b/avcodec.h	Sat Dec 20 18:06:01 2008 +0000
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR  7
+#define LIBAVCODEC_VERSION_MINOR  8
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff -r 51c9946c70f9 -r b0ec9768b39b dsputil.c
--- a/dsputil.c	Sat Dec 20 06:09:54 2008 +0000
+++ b/dsputil.c	Sat Dec 20 18:06:01 2008 +0000
@@ -2743,6 +2743,10 @@
 /* H264 specific */
 void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx);
 
+#if defined(CONFIG_RV30_DECODER)
+void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx);
+#endif /* CONFIG_RV30_DECODER */
+
 #if defined(CONFIG_RV40_DECODER)
 static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){
     put_pixels16_xy2_c(dst, src, stride, 16);
@@ -4495,6 +4499,9 @@
 #if defined(CONFIG_H264_ENCODER)
     ff_h264dspenc_init(c,avctx);
 #endif
+#if defined(CONFIG_RV30_DECODER)
+    ff_rv30dsp_init(c,avctx);
+#endif
 #if defined(CONFIG_RV40_DECODER)
     ff_rv40dsp_init(c,avctx);
     c->put_rv40_qpel_pixels_tab[0][15] = put_rv40_qpel16_mc33_c;