diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:34:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:48:51 +0200 |
| commit | 9c020810c1d04e2983fff9171104062f9471805a (patch) | |
| tree | 74e9ef92ecc467fe9aac35bccecaded622e14651 /libavcodec/mpegvideo.h | |
| parent | fe906830fd58cd281bc94c59081f66074ea69dff (diff) | |
| download | ffmpeg-9c020810c1d04e2983fff9171104062f9471805a.tar.gz | |
Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"
This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
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 a8aef0ca48..13ea78df84 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -638,6 +638,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 |