summaryrefslogtreecommitdiffstats
path: root/video/decode/lavc.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-09 20:50:06 +0100
committerwm4 <wm4@nowhere>2013-03-13 23:51:30 +0100
commit514d8a7c9dfde2acc89ee4d19dd9db6b9db5b882 (patch)
tree5a4eeebc797a16866a7dc4f8b846854c9a33f0b8 /video/decode/lavc.h
parent71b09be04056d9a505f32c71375ebc327d842ae4 (diff)
downloadmpv-514d8a7c9dfde2acc89ee4d19dd9db6b9db5b882.tar.bz2
mpv-514d8a7c9dfde2acc89ee4d19dd9db6b9db5b882.tar.xz
video: make use of libavcodec refcounting
Now lavc_dr1.c is not used anymore if libavcodec is recent enough.
Diffstat (limited to 'video/decode/lavc.h')
-rw-r--r--video/decode/lavc.h10
1 files changed, 6 insertions, 4 deletions
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 <libavcodec/avcodec.h>
+#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