generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'

Browse Source 
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
  vdpau: don't assume Picture and H264Picture are the same

Conflicts:
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-20 22:38:11 +01:00
parent e98bac82e5 7948a51b5c
commit 4d216420be
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vdpau.c
View File

@@ -45,12 +45,10 @@ AVVDPAUContext *av_alloc_vdpaucontext(void)
MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
int ff_vdpau_common_start_frame(Picture *pic,
int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic_ctx,
av_unused const uint8_t *buffer,
av_unused uint32_t size)
{
struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
pic_ctx->bitstream_buffers_allocated = 0;
pic_ctx->bitstream_buffers_used = 0;
pic_ctx->bitstream_buffers = NULL;
@@ -100,9 +98,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
#endif
int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t size)
int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
const uint8_t *buf, uint32_t size)
{
struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
VdpBitstreamBuffer *buffers = pic_ctx->bitstream_buffers;
buffers = av_fast_realloc(buffers, &pic_ctx->bitstream_buffers_allocated,