From cd8c64e197ca7295c609b120039f7032f3a9356c Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 24 Oct 2011 00:59:41 +0200 Subject: Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context" This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91 since it broke slice threading. Slice threading just duplicates MpegEncContext so every value used during mpeg_decode_slice has to be in it. A second patch will fix the illusion that Mpeg1Context is available in mpeg_decode_slice. --- libavcodec/vdpau_internal.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavcodec/vdpau_internal.h') diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 49f8e46a00..673fd3349b 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -26,12 +26,11 @@ #include #include "mpegvideo.h" -#include "mpeg12.h" void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf, int buf_size); -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); void ff_vdpau_h264_picture_start(MpegEncContext *s); -- cgit v1.2.3