summaryrefslogtreecommitdiffstats
path: root/video/decode/lavc.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-16 09:21:21 +0100
committerwm4 <wm4@nowhere>2014-03-16 13:19:19 +0100
commit3ec7f528c4af6efa9f5b5951a25ea4c6311741b5 (patch)
treea4b080461b702d5309924a981e8cf9294e494a5e /video/decode/lavc.h
parent75b185dfc50757402bbaf2c8b8fa8aa9602e92e8 (diff)
downloadmpv-3ec7f528c4af6efa9f5b5951a25ea4c6311741b5.tar.bz2
mpv-3ec7f528c4af6efa9f5b5951a25ea4c6311741b5.tar.xz
vd_lavc: remove compatibility crap
All this code was needed for compatibility with very old libavcodec versions only (such as Libav 9). Includes some now-possible simplifications too.
Diffstat (limited to 'video/decode/lavc.h')
-rw-r--r--video/decode/lavc.h28
1 files changed, 3 insertions, 25 deletions
diff --git a/video/decode/lavc.h b/video/decode/lavc.h
index 45d2d9b5cd..954b2c852f 100644
--- a/video/decode/lavc.h
+++ b/video/decode/lavc.h
@@ -41,25 +41,13 @@ typedef struct lavc_ctx {
int hwdec_fmt;
int hwdec_w;
int hwdec_h;
-
- // Legacy
- bool do_dr1;
- struct FramePool *dr1_buffer_pool;
- struct mp_image_pool *non_dr1_pool;
} vd_ffmpeg_ctx;
struct vd_lavc_hwdec {
enum hwdec_type type;
- // If non-NULL: lists pairs software and hardware decoders. If the current
- // codec is not one of the listed software decoders, probing fails.
- // Otherwise, the AVCodecContext is initialized with the associated
- // hardware decoder.
- // Useful only if hw decoding requires a special codec, instead of using
- // the libavcodec hwaccel infrastructure.
- const char **codec_pairs;
- // If not-NULL: a 0 terminated list of IMGFMT_ formats, and only one of
- // these formats is accepted in the libavcodec get_format callback.
- const int *image_formats;
+ // If not-0: the IMGFMT_ format that should be accepted in the libavcodec
+ // get_format callback.
+ int image_format;
int (*probe)(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
const char *decoder);
int (*init)(struct lavc_ctx *ctx);
@@ -90,14 +78,4 @@ bool hwdec_check_codec_support(const char *decoder,
const struct hwdec_profile_entry *table);
int hwdec_get_max_refs(struct lavc_ctx *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);
-bool mp_buffer_check(struct FrameBuffer *buffer);
-
#endif