summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Frattaroli <ffmpeg@fratti.ch>2017-11-02 20:12:48 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-11-03 13:33:14 +0100
commit6a50a8f340161a0b65feb3537591b0381a6a6b38 (patch)
tree2b68e616d1bdeb8cb19ed505bed88736f57d1311
parent1c06a32cfa5798332c1c879834a831e1e12c6f53 (diff)
downloadffmpeg-6a50a8f340161a0b65feb3537591b0381a6a6b38.tar.gz
snowenc: fix use of deprecated API
Replace avcodec_get_chroma_sub_sample with the recommended av_pix_fmt_get_chroma_sub_sample, which fixes a compilation warning. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/snowenc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index e7d670ac10..4fec377591 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -22,6 +22,7 @@
#include "libavutil/libm.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "internal.h"
#include "snow_dwt.h"
@@ -127,7 +128,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
return AVERROR_PATCHWELCOME;
}
- avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
+
+ ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift,
+ &s->chroma_v_shift);
+ if (ret) {
+ av_log(avctx, AV_LOG_ERROR, "pixel format invalid or unknown\n");
+ return ret;
+ }
ff_set_cmp(&s->mecc, s->mecc.me_cmp, s->avctx->me_cmp);
ff_set_cmp(&s->mecc, s->mecc.me_sub_cmp, s->avctx->me_sub_cmp);