virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'd264c720f7b74286840719e506daba39f83b438b'

Browse Source 
* commit 'd264c720f7b74286840719e506daba39f83b438b':
  lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-14 13:44:19 +01:00
parent afccfaf26a d264c720f7
commit eb2da769bd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavutil/pixdesc.c
View File

@@ -2134,6 +2134,11 @@ enum AVPixelFormat av_get_pix_fmt(const char *name)
snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le")); snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le"));
pix_fmt = get_pix_fmt_internal(name2); 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; return pix_fmt;
} }