From 514d8a7c9dfde2acc89ee4d19dd9db6b9db5b882 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 Mar 2013 20:50:06 +0100 Subject: video: make use of libavcodec refcounting Now lavc_dr1.c is not used anymore if libavcodec is recent enough. --- video/decode/lavc.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'video/decode/lavc.h') diff --git a/video/decode/lavc.h b/video/decode/lavc.h index d23c3e85f6..41701be1d6 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -5,6 +5,8 @@ #include +#include "config.h" + #include "demux/stheader.h" #include "video/mp_image.h" @@ -13,25 +15,25 @@ typedef struct ffmpeg_ctx { AVFrame *pic; struct hwdec *hwdec; enum PixelFormat pix_fmt; - int do_hw_dr1, do_dr1; + int do_hw_dr1; int vo_initialized; int best_csp; AVRational last_sample_aspect_ratio; enum AVDiscard skip_frame; const char *software_fallback_decoder; + + bool do_dr1; struct FramePool *dr1_buffer_pool; struct mp_image_pool *non_dr1_pool; } vd_ffmpeg_ctx; +// lavc_dr1.c int mp_codec_get_buffer(AVCodecContext *s, AVFrame *frame); void mp_codec_release_buffer(AVCodecContext *s, AVFrame *frame); - struct FrameBuffer; - void mp_buffer_ref(struct FrameBuffer *buffer); void mp_buffer_unref(struct FrameBuffer *buffer); bool mp_buffer_is_unique(struct FrameBuffer *buffer); - void mp_buffer_pool_free(struct FramePool **pool); #endif -- cgit v1.2.3