diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-12-20 18:06:01 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-12-20 18:06:01 +0000 |
| commit | 6beb8b2612e9f212fb1415647be4c5e87a7f1b97 (patch) | |
| tree | 7f3c7e4f5812b39692bf664ff44d87bb44dee232 /libavcodec | |
| parent | 52476c1beeafbb31e3277e950ec175444ece05af (diff) | |
| download | ffmpeg-6beb8b2612e9f212fb1415647be4c5e87a7f1b97.tar.gz | |
RV30 decoder
Originally committed as revision 16247 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil.c | 7 |
4 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 67f23db2e4..e4fb30d6e9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -178,6 +178,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_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 --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 7faf4fa830..1fdda8e052 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -132,6 +132,7 @@ void avcodec_register_all(void) 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 --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d98d2f21a9..81ca0c3c8f 100644 --- 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 7 +#define LIBAVCODEC_VERSION_MINOR 8 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 6cd7131c57..78942775e4 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2743,6 +2743,10 @@ void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); /* 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 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) #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; |