diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:24:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:24:30 +0100 |
commit | 1ac4797d1998a894eccc5fe68396c7df1abd2093 (patch) | |
tree | 7406463abc0fda2cbf8e25c4f7ced40909ef7d2d /libavcodec | |
parent | 7c888ae746da0d9f6a11bab9758c01d641b49d7b (diff) | |
parent | 7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2 (diff) | |
download | ffmpeg-1ac4797d1998a894eccc5fe68396c7df1abd2093.tar.gz |
Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'
* commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2':
mpeg12dec: Remove unused swap_uv member from Mpeg1Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpeg12dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index ff5ea16e98..11cc5d2f55 100644 --- 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 |