Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'

* commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2': mpeg12dec: Remove unused swap_uv member from Mpeg1Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 1ac4797d19
parent 7c888ae746 7b9780e7bf
commit 1ac4797d19
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@ -46,7 +46,6 @@ typedef struct Mpeg1Context {
    int repeat_field; /* true if we must repeat the field */
    AVPanScan pan_scan;              /**< some temporary storage for the panscan */
    int slice_count;
-    int swap_uv;//indicate VCR2
    int save_aspect_info;
    int save_width, save_height, save_progressive_seq;
    AVRational frame_rate_ext;       ///< MPEG-2 specific framerate modificator