diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 15:33:23 +0100 |
| commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
| tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavcodec/dsputil_template.c | |
| parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
| parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) | |
| download | android_external_ffmpeg-26345acb0e723d28aa28e09126ea383b2f679f5b.tar.gz android_external_ffmpeg-26345acb0e723d28aa28e09126ea383b2f679f5b.tar.bz2 android_external_ffmpeg-26345acb0e723d28aa28e09126ea383b2f679f5b.zip | |
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_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 26167d808f..5162304d05 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -582,10 +582,6 @@ PIXOP2(put, op_put) #define put_no_rnd_pixels8_c put_pixels8_c #define put_no_rnd_pixels16_c put_pixels16_c -static void FUNCC(put_no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *a, const uint8_t *b, int stride, int h){ - FUNC(put_no_rnd_pixels8_l2)(dst, a, b, stride, stride, stride, h); -} - #define H264_CHROMA_MC(OPNAME, OP)\ static void FUNCC(OPNAME ## h264_chroma_mc2)(uint8_t *p_dst/*align 8*/, uint8_t *p_src/*align 1*/, int stride, int h, int x, int y){\ pixel *dst = (pixel*)p_dst;\ |