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/mpeg12.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/mpeg12.h')
| -rw-r--r-- | libavcodec/mpeg12.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 89db30b18f..9a9cc85dee 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 tmpgexs; } Mpeg1Context; |