diff options
| author | James Almer <jamrial@gmail.com> | 2017-01-07 23:13:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-01-12 22:53:04 -0300 |
| commit | cf9ef839606dd50f779c395d8a277de143f7e5b2 (patch) | |
| tree | 615bcdf1fc268c6ef0b3cc75273ca08aff8254bd /libavcodec/pngenc.c | |
| parent | 30c1f27299d3fc2b0c0858c003066cc5e36a28af (diff) | |
| download | ffmpeg-cf9ef839606dd50f779c395d8a277de143f7e5b2.tar.gz | |
huffyuvencdsp: move shared functions to a new lossless_videoencdsp context
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/pngenc.c')
| -rw-r--r-- | libavcodec/pngenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 3aeff83f42..f67a546f95 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -22,7 +22,7 @@ #include "avcodec.h" #include "internal.h" #include "bytestream.h" -#include "huffyuvencdsp.h" +#include "lossless_videoencdsp.h" #include "png.h" #include "apng.h" @@ -47,7 +47,7 @@ typedef struct APNGFctlChunk { typedef struct PNGEncContext { AVClass *class; - HuffYUVEncDSPContext hdsp; + LLVidEncDSPContext llvidencdsp; uint8_t *bytestream; uint8_t *bytestream_start; @@ -159,7 +159,7 @@ static void sub_left_prediction(PNGEncContext *c, uint8_t *dst, const uint8_t *s for (x = 0; x < unaligned_w; x++) *dst++ = *src1++ - *src2++; size -= unaligned_w; - c->hdsp.diff_bytes(dst, src1, src2, size); + c->llvidencdsp.diff_bytes(dst, src1, src2, size); } static void png_filter_row(PNGEncContext *c, uint8_t *dst, int filter_type, @@ -175,7 +175,7 @@ static void png_filter_row(PNGEncContext *c, uint8_t *dst, int filter_type, sub_left_prediction(c, dst, src, bpp, size); break; case PNG_FILTER_VALUE_UP: - c->hdsp.diff_bytes(dst, src, top, size); + c->llvidencdsp.diff_bytes(dst, src, top, size); break; case PNG_FILTER_VALUE_AVG: for (i = 0; i < bpp; i++) @@ -1015,7 +1015,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - ff_huffyuvencdsp_init(&s->hdsp, avctx); + ff_llvidencdsp_init(&s->llvidencdsp); #if FF_API_PRIVATE_OPT FF_DISABLE_DEPRECATION_WARNINGS |