diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
| commit | a85311ef841b87ddaacf7c198f422db5c1ac2d60 (patch) | |
| tree | 0c39d27f14ae7168bbc36f57d049a964c6e63a12 /libavcodec/dsputil.h | |
| parent | 098d3891be08ca119e20ad7989668ddef83b31ea (diff) | |
| parent | 68f18f03519ae550e25cf12661172641e9f0eaca (diff) | |
| download | ffmpeg-streaming-a85311ef841b87ddaacf7c198f422db5c1ac2d60.zip ffmpeg-streaming-a85311ef841b87ddaacf7c198f422db5c1ac2d60.tar.gz | |
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 3410a40..49005e4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -339,9 +339,6 @@ typedef struct DSPContext { qpel_mc_func put_h264_qpel_pixels_tab[4][16]; qpel_mc_func avg_h264_qpel_pixels_tab[4][16]; - qpel_mc_func put_2tap_qpel_pixels_tab[4][16]; - qpel_mc_func avg_2tap_qpel_pixels_tab[4][16]; - me_cmp_func pix_abs[2][4]; /* huffyuv specific */ |
