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/fmt-conversion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/fmt-conversion.h') diff --git a/video/fmt-conversion.h b/video/fmt-conversion.h index f7114b0aef..c8f0b883b1 100644 --- a/video/fmt-conversion.h +++ b/video/fmt-conversion.h @@ -21,7 +21,7 @@ #include -enum PixelFormat imgfmt2pixfmt(int fmt); -int pixfmt2imgfmt(enum PixelFormat pix_fmt); +enum AVPixelFormat imgfmt2pixfmt(int fmt); +int pixfmt2imgfmt(enum AVPixelFormat pix_fmt); #endif /* MPLAYER_FMT_CONVERSION_H */ -- cgit v1.2.3