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/out/vo_lavc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/out/vo_lavc.c') diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 77c9f9f875..2da3f06a3c 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -94,7 +94,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, uint32_t format) { struct priv *vc = vo->priv; - enum PixelFormat pix_fmt = imgfmt2pixfmt(format); + enum AVPixelFormat pix_fmt = imgfmt2pixfmt(format); AVRational display_aspect_ratio, image_aspect_ratio; AVRational aspect; @@ -135,7 +135,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, vc->lastframeipts = MP_NOPTS_VALUE; vc->lastencodedipts = MP_NOPTS_VALUE; - if (pix_fmt == PIX_FMT_NONE) + if (pix_fmt == AV_PIX_FMT_NONE) goto error; /* imgfmt2pixfmt already prints something */ vc->stream = encode_lavc_alloc_stream(vo->encode_lavc_ctx, @@ -174,7 +174,7 @@ error: static int query_format(struct vo *vo, uint32_t format) { - enum PixelFormat pix_fmt = imgfmt2pixfmt(format); + enum AVPixelFormat pix_fmt = imgfmt2pixfmt(format); if (!vo->encode_lavc_ctx) return 0; -- cgit v1.2.3