[FFmpeg-cvslog] Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 15:24:21 2013 +0100| [1ac4797d1998a894eccc5fe68396c7df1abd2093] | committer: Michael Niedermayer

Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'

* commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2':
  mpeg12dec: Remove unused swap_uv member from Mpeg1Context

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ac4797d1998a894eccc5fe68396c7df1abd2093
---