diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:18:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:18:43 +0400 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/dsputil.c | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 7997885543..7314215387 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2768,8 +2768,6 @@ static void ff_jref_idct1_add(uint8_t *dest, int line_size, DCTELEM *block) dest[0] = av_clip_uint8(dest[0] + ((block[0] + 4)>>3)); } -static void just_return(void *mem av_unused, int stride av_unused, int h av_unused) { return; } - /* init static data */ av_cold void ff_dsputil_static_init(void) { @@ -3037,8 +3035,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->shrink[2]= ff_shrink44; c->shrink[3]= ff_shrink88; - c->prefetch= just_return; - memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); @@ -3075,7 +3071,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) #define BIT_DEPTH_FUNCS(depth, dct)\ c->get_pixels = FUNCC(get_pixels ## dct , depth);\ c->draw_edges = FUNCC(draw_edges , depth);\ - c->emulated_edge_mc = FUNC (ff_emulated_edge_mc , depth);\ c->clear_block = FUNCC(clear_block ## dct , depth);\ c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\ c->add_pixels8 = FUNCC(add_pixels8 ## dct , depth);\ |