eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 16:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'

Browse Source 
* commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24':
  lavc: external hardware frame pool initialization

Includes the fix from e724bdfffb

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-11 18:58:12 -03:00
parent b125822d1d b46a77f19d
commit 48e4eda11d
27 changed files with 400 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vaapi_decode.h
View File

@@ -53,8 +53,6 @@ typedef struct VAAPIDecodePicture {
} VAAPIDecodePicture;
typedef struct VAAPIDecodeContext {
VAProfile va_profile;
VAEntrypoint va_entrypoint;
VAConfigID va_config;
VAContextID va_context;
@@ -98,4 +96,7 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx,
int ff_vaapi_decode_init(AVCodecContext *avctx);
int ff_vaapi_decode_uninit(AVCodecContext *avctx);
int ff_vaapi_common_frame_params(AVCodecContext *avctx,
AVBufferRef *hw_frames_ctx);
#endif /* AVCODEC_VAAPI_DECODE_H */