OSDN Git Service

Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:24:21 +0000 (15:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:24:30 +0000 (15:24 +0100)
commit1ac4797d1998a894eccc5fe68396c7df1abd2093
tree7406463abc0fda2cbf8e25c4f7ced40909ef7d2d
parent7c888ae746da0d9f6a11bab9758c01d641b49d7b
parent7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2
Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c