From 95c6a482eb9d97f180b54e45d2c5aa360b218cba Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 31 Oct 2017 17:11:45 +0100 Subject: vd_lavc: clean out more hwdec legacy code All this code used to be required by the old variants of the libavcodec hw decoding APIs. Almost all of that is gone, although the mediacodec API unfortunately still pulls in some old stuff (but not all of it). (mediacodec build/functionality is untested, but should work.) --- video/decode/lavc.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'video/decode/lavc.h') diff --git a/video/decode/lavc.h b/video/decode/lavc.h index cf5485d3b6..70ff4cde97 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -31,7 +31,6 @@ typedef struct lavc_ctx { AVFrame *pic; struct vd_lavc_hwdec *hwdec; AVRational codec_timebase; - enum AVPixelFormat pix_fmt; enum AVDiscard skip_frame; bool flushing; const char *decoder; @@ -62,11 +61,6 @@ typedef struct lavc_ctx { struct mp_hwdec_ctx *hwdec_dev; bool owns_hwdec_dev; - int hwdec_fmt; - int hwdec_w; - int hwdec_h; - int hwdec_profile; - bool hwdec_request_reinit; int hwdec_fail_count; @@ -102,7 +96,7 @@ struct vd_lavc_hwdec { int (*probe)(struct lavc_ctx *ctx, struct vd_lavc_hwdec *hwdec, const char *codec); int (*init)(struct lavc_ctx *ctx); - int (*init_decoder)(struct lavc_ctx *ctx, int w, int h); + int (*init_decoder)(struct lavc_ctx *ctx); void (*uninit)(struct lavc_ctx *ctx); // Process the image returned by the libavcodec decoder. struct mp_image *(*process_image)(struct lavc_ctx *ctx, struct mp_image *img); -- cgit v1.2.3