diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:14:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 23:30:09 +0100 |
| commit | b7fe35c9e50e1701274364adf7280bf4a02b092b (patch) | |
| tree | 05d5ffb039ce76bbc782d36704bdf8b135df50ce /libavcodec/vaapi_internal.h | |
| parent | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (diff) | |
| parent | 2c541554076cc8a72e7145d4da30389ca763f32f (diff) | |
| download | ffmpeg-b7fe35c9e50e1701274364adf7280bf4a02b092b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: deMpegEncContextize
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_internal.h')
| -rw-r--r-- | libavcodec/vaapi_internal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h index e514dd6f44..1ac0e9fe35 100644 --- a/libavcodec/vaapi_internal.h +++ b/libavcodec/vaapi_internal.h @@ -42,7 +42,7 @@ static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic) } /** Common AVHWAccel.end_frame() implementation */ -int ff_vaapi_common_end_frame(MpegEncContext *s); +void ff_vaapi_common_end_frame(AVCodecContext *avctx); /** Allocate a new picture parameter buffer */ void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size); @@ -63,6 +63,10 @@ uint8_t *ff_vaapi_alloc_bitplane(struct vaapi_context *vactx, uint32_t size); */ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, const uint8_t *buffer, uint32_t size); +int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx); +int ff_vaapi_commit_slices(struct vaapi_context *vactx); +int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface); + /* @} */ #endif /* AVCODEC_VAAPI_INTERNAL_H */ |