diff options
| author | wm4 <wm4@nowhere> | 2013-11-29 17:39:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-29 17:39:57 +0100 |
| commit | 597b8a355002306486c5d4a19890bb403b5d3ded (patch) | |
| tree | 17de2fbbb77868cb184b6a0f2eca5fffd14d2e9b /video/filter | |
| parent | f1072e7629c56e6fdd9aab40be15fe9800789b1a (diff) | |
| download | mpv-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 'video/filter')
| -rw-r--r-- | video/filter/vf_scale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 6ac9d43eb9..d195cf230e 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -157,7 +157,7 @@ static int preferred_conversions[][2] = { static int check_outfmt(vf_instance_t *vf, int outfmt) { enum AVPixelFormat pixfmt = imgfmt2pixfmt(outfmt); - if (pixfmt == PIX_FMT_NONE || sws_isSupportedOutput(pixfmt) < 1) + if (pixfmt == AV_PIX_FMT_NONE || sws_isSupportedOutput(pixfmt) < 1) return 0; return vf_next_query_format(vf, outfmt); } @@ -375,7 +375,7 @@ static int control(struct vf_instance *vf, int request, void *data) static int query_format(struct vf_instance *vf, unsigned int fmt) { - if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != PIX_FMT_NONE) { + if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != AV_PIX_FMT_NONE) { if (sws_isSupportedInput(imgfmt2pixfmt(fmt)) < 1) return 0; unsigned int best = find_best_out(vf, fmt); |