diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 12:04:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 12:09:17 +0200 |
| commit | b64b719ad5c212e197009fa3f1e7aa96255cbd28 (patch) | |
| tree | 38b2b3d650a29e10136bf251277db559b3d2cb58 /libavcodec/vdpau_internal.h | |
| parent | 567c0dcee6745dc53d67e6de796270449b5753f7 (diff) | |
| parent | fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7 (diff) | |
Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7'
* commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7':
vdpau: factor out common end-of-frame handling
Conflicts:
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
| -rw-r--r-- | libavcodec/vdpau_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 0f3652b729..1debbe6e2b 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -80,6 +80,8 @@ struct vdpau_picture_context { int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic, const uint8_t *buffer, uint32_t size); +int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame, + struct vdpau_picture_context *pic); int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx); int ff_vdpau_add_buffer(struct vdpau_picture_context *pic, const uint8_t *buf, uint32_t buf_size); |