aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv30dsp.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-01-19 03:34:47 +0100
committerDiego Biurrun <diego@biurrun.de>2013-02-06 11:30:53 +0100
commit79dad2a932534d1155079f937649e099f9e5cc27 (patch)
tree9b3018db13e312b28cc7df17ba71bacf5f94d4bd /libavcodec/rv30dsp.c
parent293065bdb56e603589ad8a29326406c39323e153 (diff)
downloadffmpeg-79dad2a932534d1155079f937649e099f9e5cc27.tar.gz
dsputil: Separate h264chroma
Diffstat (limited to 'libavcodec/rv30dsp.c')
-rw-r--r--libavcodec/rv30dsp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c
index ba5ae0f655..394aeca347 100644
--- a/libavcodec/rv30dsp.c
+++ b/libavcodec/rv30dsp.c
@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "dsputil.h"
+#include "h264chroma.h"
#include "h264qpel.h"
#include "rv34dsp.h"
@@ -254,9 +255,11 @@ RV30_MC(avg_, 8)
RV30_MC(avg_, 16)
av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) {
+ H264ChromaContext h264chroma;
H264QpelContext qpel;
ff_rv34dsp_init(c, dsp);
+ ff_h264chroma_init(&h264chroma, 8);
ff_h264qpel_init(&qpel, 8);
c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0];
@@ -296,8 +299,8 @@ av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) {
c->avg_pixels_tab[1][ 9] = avg_rv30_tpel8_mc12_c;
c->avg_pixels_tab[1][10] = avg_rv30_tpel8_mc22_c;
- c->put_chroma_pixels_tab[0] = dsp->put_h264_chroma_pixels_tab[0];
- c->put_chroma_pixels_tab[1] = dsp->put_h264_chroma_pixels_tab[1];
- c->avg_chroma_pixels_tab[0] = dsp->avg_h264_chroma_pixels_tab[0];
- c->avg_chroma_pixels_tab[1] = dsp->avg_h264_chroma_pixels_tab[1];
+ c->put_chroma_pixels_tab[0] = h264chroma.put_h264_chroma_pixels_tab[0];
+ c->put_chroma_pixels_tab[1] = h264chroma.put_h264_chroma_pixels_tab[1];
+ c->avg_chroma_pixels_tab[0] = h264chroma.avg_h264_chroma_pixels_tab[0];
+ c->avg_chroma_pixels_tab[1] = h264chroma.avg_h264_chroma_pixels_tab[1];
}