summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-29 17:39:57 +0100
committerwm4 <wm4@nowhere>2013-11-29 17:39:57 +0100
commit597b8a355002306486c5d4a19890bb403b5d3ded (patch)
tree17de2fbbb77868cb184b6a0f2eca5fffd14d2e9b /mpvcore
parentf1072e7629c56e6fdd9aab40be15fe9800789b1a (diff)
downloadmpv-597b8a355002306486c5d4a19890bb403b5d3ded.tar.bz2
mpv-597b8a355002306486c5d4a19890bb403b5d3ded.tar.xz
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.
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/encode_lavc.c6
-rw-r--r--mpvcore/encode_lavc.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/mpvcore/encode_lavc.c b/mpvcore/encode_lavc.c
index 84d726cfdc..d2017a7f37 100644
--- a/mpvcore/encode_lavc.c
+++ b/mpvcore/encode_lavc.c
@@ -754,19 +754,19 @@ int encode_lavc_write_frame(struct encode_lavc_context *ctx, AVPacket *packet)
}
int encode_lavc_supports_pixfmt(struct encode_lavc_context *ctx,
- enum PixelFormat pix_fmt)
+ enum AVPixelFormat pix_fmt)
{
CHECK_FAIL(ctx, 0);
if (!ctx->vc)
return 0;
- if (pix_fmt == PIX_FMT_NONE)
+ if (pix_fmt == AV_PIX_FMT_NONE)
return 0;
if (!ctx->vc->pix_fmts)
return VFCAP_CSP_SUPPORTED;
else {
- const enum PixelFormat *p;
+ const enum AVPixelFormat *p;
for (p = ctx->vc->pix_fmts; *p >= 0; ++p) {
if (pix_fmt == *p)
return VFCAP_CSP_SUPPORTED;
diff --git a/mpvcore/encode_lavc.h b/mpvcore/encode_lavc.h
index f47825e1d7..15e0a5c7f2 100644
--- a/mpvcore/encode_lavc.h
+++ b/mpvcore/encode_lavc.h
@@ -79,7 +79,7 @@ struct encode_lavc_context {
AVStream *encode_lavc_alloc_stream(struct encode_lavc_context *ctx, enum AVMediaType mt);
void encode_lavc_write_stats(struct encode_lavc_context *ctx, AVStream *stream);
int encode_lavc_write_frame(struct encode_lavc_context *ctx, AVPacket *packet);
-int encode_lavc_supports_pixfmt(struct encode_lavc_context *ctx, enum PixelFormat format);
+int encode_lavc_supports_pixfmt(struct encode_lavc_context *ctx, enum AVPixelFormat format);
AVCodec *encode_lavc_get_codec(struct encode_lavc_context *ctx, AVStream *stream);
int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream);
int encode_lavc_available(struct encode_lavc_context *ctx);