ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Thu Apr 14 13:44:19 2016 +0100| [eb2da769bddf7e8f4f3202162dacd17c77770dd8] | committer: Derek Buitenhuis
Merge commit 'd264c720f7b74286840719e506daba39f83b438b' * commit 'd264c720f7b74286840719e506daba39f83b438b': lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb2da769bddf7e8f4f3202162dacd17c77770dd8 --- libavutil/pixdesc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 981fa0e..8a9475c 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; } ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
