diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2017-11-06 22:39:16 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-06 19:13:03 -0300 |
| commit | 4ada428aae2f4ab42c6cebc0d7591c0e62db6fe2 (patch) | |
| tree | 64ff90f19d094203be823c34caf0da5e8390eb61 /libavcodec/j2kenc.c | |
| parent | 7d1c79f533e0c80cbcda60d3cbd8216551a1bac5 (diff) | |
| download | ffmpeg-4ada428aae2f4ab42c6cebc0d7591c0e62db6fe2.tar.gz | |
avcodec: remove remaining uses of avcodec_get_chroma_sub_sample
Replace them with av_pix_fmt_get_chroma_sub_sample.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/j2kenc.c')
| -rw-r--r-- | libavcodec/j2kenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index c8d3861732..2135ece540 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -69,6 +69,7 @@ #include "bytestream.h" #include "jpeg2000.h" #include "libavutil/common.h" +#include "libavutil/pixdesc.h" #include "libavutil/opt.h" #define NMSEDEC_BITS 7 @@ -1150,8 +1151,10 @@ FF_ENABLE_DEPRECATION_WARNINGS } else{ // planar YUV s->planar = 1; s->ncomponents = 3; - avcodec_get_chroma_sub_sample(avctx->pix_fmt, - s->chroma_shift, s->chroma_shift + 1); + ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, + s->chroma_shift, s->chroma_shift + 1); + if (ret) + return ret; } ff_jpeg2000_init_tier1_luts(); |