summaryrefslogtreecommitdiffstats
path: root/video/sws_utils.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-29 17:39:57 +0100
committerwm4 <wm4@nowhere>2013-11-29 17:39:57 +0100
commit597b8a355002306486c5d4a19890bb403b5d3ded (patch)
tree17de2fbbb77868cb184b6a0f2eca5fffd14d2e9b /video/sws_utils.c
parentf1072e7629c56e6fdd9aab40be15fe9800789b1a (diff)
downloadmpv-597b8a355002306486c5d4a19890bb403b5d3ded.tar.bz2
mpv-597b8a355002306486c5d4a19890bb403b5d3ded.tar.xz
Take care of some libavutil deprecations, drop support for FFmpeg 1.0
PIX_FMT_* -> AV_PIX_FMT_* (except some pixdesc constants) enum PixelFormat -> enum AVPixelFormat Losen some version checks in certain newer pixel formats. av_pix_fmt_descriptors -> av_pix_fmt_desc_get This removes support for FFmpeg 1.0.x, which is even older than Libav 9.x. Support for it probably was already broken, and its libswresample was rejected by our build system anyway because it's broken. Mostly untested; it does compile with Libav 9.9.
Diffstat (limited to 'video/sws_utils.c')
-rw-r--r--video/sws_utils.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/video/sws_utils.c b/video/sws_utils.c
index 27cd0c7330..3bc6bc4910 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -79,9 +79,9 @@ void mp_sws_set_from_cmdline(struct mp_sws_context *ctx)
bool mp_sws_supported_format(int imgfmt)
{
- enum PixelFormat av_format = imgfmt2pixfmt(imgfmt);
+ enum AVPixelFormat av_format = imgfmt2pixfmt(imgfmt);
- return av_format != PIX_FMT_NONE && sws_isSupportedInput(av_format)
+ return av_format != AV_PIX_FMT_NONE && sws_isSupportedInput(av_format)
&& sws_isSupportedOutput(av_format);
}
@@ -204,12 +204,12 @@ int mp_sws_reinit(struct mp_sws_context *ctx)
if (!src_fmt.id || !dst_fmt.id)
return -1;
- enum PixelFormat s_fmt = imgfmt2pixfmt(src->imgfmt);
- if (s_fmt == PIX_FMT_NONE || sws_isSupportedInput(s_fmt) < 1)
+ enum AVPixelFormat s_fmt = imgfmt2pixfmt(src->imgfmt);
+ if (s_fmt == AV_PIX_FMT_NONE || sws_isSupportedInput(s_fmt) < 1)
return -1;
- enum PixelFormat d_fmt = imgfmt2pixfmt(dst->imgfmt);
- if (d_fmt == PIX_FMT_NONE || sws_isSupportedOutput(d_fmt) < 1)
+ enum AVPixelFormat d_fmt = imgfmt2pixfmt(dst->imgfmt);
+ if (d_fmt == AV_PIX_FMT_NONE || sws_isSupportedOutput(d_fmt) < 1)
return -1;
int s_csp = mp_csp_to_sws_colorspace(src->colorspace);
@@ -273,7 +273,7 @@ int mp_sws_scale(struct mp_sws_context *ctx, struct mp_image *dst,
{
// Hack for older swscale versions which don't support this.
// We absolutely need this in the OSD rendering path.
- if (dst->imgfmt == IMGFMT_GBRP && !sws_isSupportedOutput(PIX_FMT_GBRP))
+ if (dst->imgfmt == IMGFMT_GBRP && !sws_isSupportedOutput(AV_PIX_FMT_GBRP))
return to_gbrp(dst, src, ctx->flags);
mp_image_params_from_image(&ctx->src, src);