diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
commit | 90875001793400c01f8290260cec2e284620477f (patch) | |
tree | e1a05cbe8599e8c27542efe712c21fa1c41d7f97 /video/fmt-conversion.c | |
parent | 5b6eab01af32cdf886f0ae9fc1c50e3aa1584da2 (diff) | |
parent | 3a831b2c016944c1f976d07c5ee9002c6250d9ac (diff) | |
download | mpv-90875001793400c01f8290260cec2e284620477f.tar.bz2 mpv-90875001793400c01f8290260cec2e284620477f.tar.xz |
Merge remote-tracking branch 'origin/have_configure'
Diffstat (limited to 'video/fmt-conversion.c')
-rw-r--r-- | video/fmt-conversion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 8bb119553f..7d37e8ca87 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -171,7 +171,7 @@ static const struct { {IMGFMT_BGRA64_LE, PIX_FMT_BGRA64LE}, #endif -#if HAVE_AV_CODEC_NEW_VDPAU_API +#if HAVE_AVCODEC_NEW_VDPAU_API {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU}, #else {IMGFMT_VDPAU_MPEG1, PIX_FMT_VDPAU_MPEG1}, |