diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:14:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:17:32 +0100 |
| commit | 088f20a33251502851958a2b5468dbe07fbf3ff6 (patch) | |
| tree | 3f1352e9e2824d5a9a2cfd7989cd5c5ceb577086 | |
| parent | 536d1ed7934d2c9c818dd833e1058eaab479d51d (diff) | |
| parent | 2ed008204d5467be03a0a3af1e293b2f7038d0a0 (diff) | |
| download | ffmpeg-088f20a33251502851958a2b5468dbe07fbf3ff6.tar.gz | |
Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0':
h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil
Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264_mb_template.c
libavcodec/h264addpx_template.c
libavcodec/h264dsp.c
libavcodec/h264dsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dsputil.c | 3 | ||||
| -rw-r--r-- | libavcodec/h264.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index b93851c6ae..2bcc3ee339 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -463,7 +463,6 @@ static void add_pixels8_c(uint8_t *av_restrict pixels, } } - static void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, int line_size) { @@ -2902,7 +2901,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->get_pixels = FUNCC(get_pixels ## dct , depth);\ c->draw_edges = FUNCC(draw_edges , depth);\ c->clear_block = FUNCC(clear_block ## dct , depth);\ - c->clear_blocks = FUNCC(clear_blocks ## dct , depth) + c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\ switch (avctx->bits_per_raw_sample) { case 9: diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec709760e4..e854ded6c9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2216,7 +2216,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, } else { if (transform_bypass) { idct_dc_add = - idct_add = h->h264dsp.h264_add_pixels4_clear; + idct_add = h->h264dsp.h264_add_pixels4_clear; } else { idct_dc_add = h->h264dsp.h264_idct_dc_add; idct_add = h->h264dsp.h264_idct_add; |