From 597b8a355002306486c5d4a19890bb403b5d3ded Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Nov 2013 17:39:57 +0100 Subject: 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. --- video/img_format.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'video/img_format.c') diff --git a/video/img_format.c b/video/img_format.c index 73e50bd803..b3d0c8bd91 100644 --- a/video/img_format.c +++ b/video/img_format.c @@ -157,8 +157,9 @@ const char *mp_imgfmt_to_name(unsigned int fmt) struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt) { - enum PixelFormat fmt = imgfmt2pixfmt(mpfmt); - if (fmt == PIX_FMT_NONE) { + enum AVPixelFormat fmt = imgfmt2pixfmt(mpfmt); + const AVPixFmtDescriptor *pd = av_pix_fmt_desc_get(fmt); + if (!pd || fmt == AV_PIX_FMT_NONE) { const char *name = mp_imgfmt_to_name(mpfmt); if (name) { mp_msg(MSGT_DECVIDEO, MSGL_V, @@ -167,9 +168,6 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt) return (struct mp_imgfmt_desc) {0}; } - const AVPixFmtDescriptor *pd = &av_pix_fmt_descriptors[fmt]; - assert(pd); - struct mp_imgfmt_desc desc = { .id = mpfmt, .avformat = fmt, @@ -207,7 +205,7 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt) if (mpfmt == IMGFMT_XYZ12_LE || mpfmt == IMGFMT_XYZ12_BE) { desc.flags |= MP_IMGFLAG_XYZ; - } else if (!(pd->flags & PIX_FMT_RGB) && fmt != PIX_FMT_MONOBLACK && + } else if (!(pd->flags & PIX_FMT_RGB) && fmt != AV_PIX_FMT_MONOBLACK && fmt != PIX_FMT_PAL8) { desc.flags |= MP_IMGFLAG_YUV; -- cgit v1.2.3