diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:04:11 +0200 |
| commit | f9418d156fe641af50d05114a9787a3bdb579369 (patch) | |
| tree | 85db1ae696dfaba1b5603d412a57ac19d6391b37 /libavcodec/vp56dsp.h | |
| parent | b99d3613cfdb5714a3c0e18b0db209280d879a10 (diff) | |
| parent | 8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (diff) | |
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56dsp.h')
| -rw-r--r-- | libavcodec/vp56dsp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp56dsp.h b/libavcodec/vp56dsp.h index 51e8c16480..7807baa4b1 100644 --- a/libavcodec/vp56dsp.h +++ b/libavcodec/vp56dsp.h @@ -36,7 +36,7 @@ void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, int stride, const int16_t *h_weights, const int16_t *v_weights); void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec); -void ff_vp56dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec); -void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec); +void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec); +void ff_vp6dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec); #endif /* AVCODEC_VP56DSP_H */ |