diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:44:19 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-14 13:46:00 +0100 |
| commit | eb2da769bddf7e8f4f3202162dacd17c77770dd8 (patch) | |
| tree | 84765fcfd7855848d3b147cf1036c79e2a66433f | |
| parent | afccfaf26ac8fae3257302a74110b40615dfa05d (diff) | |
| parent | d264c720f7b74286840719e506daba39f83b438b (diff) | |
| download | ffmpeg-eb2da769bddf7e8f4f3202162dacd17c77770dd8.tar.gz | |
Merge commit 'd264c720f7b74286840719e506daba39f83b438b'
* commit 'd264c720f7b74286840719e506daba39f83b438b':
lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavutil/pixdesc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 981fa0e16a..8a9475c4e3 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2134,6 +2134,11 @@ enum AVPixelFormat av_get_pix_fmt(const char *name) snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le")); pix_fmt = get_pix_fmt_internal(name2); } + +#if FF_API_VAAPI + if (pix_fmt == AV_PIX_FMT_NONE && !strcmp(name, "vaapi")) + pix_fmt = AV_PIX_FMT_VAAPI; +#endif return pix_fmt; } |