-
Michael Niedermayer authored
* commit 'bab8d737': vaapi: wrap codec specific functions in appropiate #ifs Conflicts: libavcodec/vaapi.c See: f2118d44Merged-by: Michael Niedermayer <michaelni@gmx.at>
228fded0
* commit 'bab8d737': vaapi: wrap codec specific functions in appropiate #ifs Conflicts: libavcodec/vaapi.c See: f2118d44Merged-by: Michael Niedermayer <michaelni@gmx.at>