History

Merge commit 'd264c720f7b74286840719e506daba39f83b438b'

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

Derek Buitenhuis committed 10 years ago

Commit eb2da762 parents afccfaf d264c721 file · +5 −0Browse files

Unified · Split

libavutil/pixdesc.c+5−0
@@ -2134,6 +2134,11 @@ enum AVPixelFormat av_get_pix_fmt(const char *name) · 2133 unmodified lines
21342134 snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le"));
21352135 pix_fmt = get_pix_fmt_internal(name2);
21362136 }
2137+
2138+#if FF_API_VAAPI
2139+ if (pix_fmt == AV_PIX_FMT_NONE && !strcmp(name, "vaapi"))
2140+ pix_fmt = AV_PIX_FMT_VAAPI;
2141+#endif
21372142 return pix_fmt;
21382143 }
21392144

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t