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/mpeg12.h | 1 - 1 file changed, 1 deletion(-) (limited to 'libavcodec/mpeg12.h') diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 209bf05234..ab0352ff10 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -41,7 +41,6 @@ typedef struct Mpeg1Context { int save_width, save_height, save_progressive_seq; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame? - int full_pel[2]; int closed_gop; ///< GOP is closed } Mpeg1Context; -- cgit v1.2.3