Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 03:15:09 +0000 (04:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 03:15:57 +0000 (04:15 +0100)
commit0dd8e96b32b2bd757261e738a80c2987185125e8
tree901b0f5cdc4a5b652f71a4ff9eb10c43172f46c6
parent32ab5b82f4b4391137659f8a727ee7955a5c79cf
parent16e7b189c548b4075ff4b5dd62af10e2acae260b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Fix swapping of UV planes for VCR2

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