Merge remote-tracking branch 'qatar/master'
* qatar/master: vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame Conflicts: libavcodec/vaapi.c libavcodec/vaapi_internal.h See: 377cfc28Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment