diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 23:45:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 23:45:44 +0200 |
| commit | f0a7b67a356def037d26f9460b22c86d82be2b89 (patch) | |
| tree | 81f96865b5112c9299efc48cc0842cda4f21df42 /libavcodec/vdpau.c | |
| parent | f44c816566be23e5b6c09efb1200755fd0cef214 (diff) | |
| parent | c8477df019f02a436c69e8ca54370dd5cf8eee97 (diff) | |
| download | ffmpeg-f0a7b67a356def037d26f9460b22c86d82be2b89.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcm: use sign_extend()
mpeg12: fix mpeg_decode_slice context parameter type
Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 260d05d906..ce5103a6af 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -190,10 +190,9 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s) render->bitstream_buffers_used = 0; } -void ff_vdpau_mpeg_picture_complete(Mpeg1Context *s1, const uint8_t *buf, +void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, int buf_size, int slice_count) { - MpegEncContext *s = &s1->mpeg_enc_ctx; struct vdpau_render_state *render, *last, *next; int i; |