diff options
Diffstat (limited to 'libavcodec/vaapi_decode.h')
| -rw-r--r-- | libavcodec/vaapi_decode.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index fda228b5a9..6b415dd1d3 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -24,12 +24,11 @@ #include "libavutil/frame.h" #include "libavutil/hwcontext.h" #include "libavutil/hwcontext_vaapi.h" -#include "libavutil/internal.h" #include "avcodec.h" #include "version.h" -#if FF_API_VAAPI_CONTEXT +#if FF_API_STRUCT_VAAPI_CONTEXT #include "vaapi.h" #endif @@ -57,7 +56,7 @@ typedef struct VAAPIDecodeContext { VAConfigID va_config; VAContextID va_context; -#if FF_API_VAAPI_CONTEXT +#if FF_API_STRUCT_VAAPI_CONTEXT FF_DISABLE_DEPRECATION_WARNINGS int have_old_context; struct vaapi_context *old_context; @@ -73,6 +72,8 @@ FF_ENABLE_DEPRECATION_WARNINGS enum AVPixelFormat surface_format; int surface_count; + + VASurfaceAttrib pixel_format_attribute; } VAAPIDecodeContext; |