-
Timo Rothenpieler authored
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> (cherry picked from commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e) Conflicts: modules/codec/avcodec/vaapi.c
4af25812
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit dc4b64c97b82d4d590ccf7fa1c938435cc26d98e)
Conflicts:
modules/codec/avcodec/vaapi.c