diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 17:54:06 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 18:33:23 +0400 |
commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavcodec/dsputil.c | |
parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r-- | libavcodec/dsputil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index ffb508535f..c52c8f1703 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2946,7 +2946,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\ c->add_pixels8 = FUNCC(add_pixels8 ## dct , depth);\ c->add_pixels4 = FUNCC(add_pixels4 ## dct , depth);\ - c->put_no_rnd_pixels_l2 = FUNCC(put_no_rnd_pixels8_l2 , depth);\ \ c->put_h264_chroma_pixels_tab[0] = FUNCC(put_h264_chroma_mc8 , depth);\ c->put_h264_chroma_pixels_tab[1] = FUNCC(put_h264_chroma_mc4 , depth);\ |