diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-10-24 00:59:41 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-24 00:59:41 +0200 |
| commit | cd8c64e197ca7295c609b120039f7032f3a9356c (patch) | |
| tree | 2ed1010b1a7924b29f879d9d17a33a879e88342a /libavcodec/mpegvideo.h | |
| parent | 16ad77b357ebbe74a7bc9568904c328a2722651e (diff) | |
| download | ffmpeg-cd8c64e197ca7295c609b120039f7032f3a9356c.tar.gz | |
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.
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index b69519a272..46ad5d8306 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -633,6 +633,7 @@ typedef struct MpegEncContext { int chroma_y_shift; int progressive_frame; + int full_pel[2]; int interlaced_dct; int first_slice; int first_field; ///< is 1 for the first field of a field picture 0 otherwise |