Merge commit '582963a8156522582e55466be4a59974a8d909a5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)
commitbbc7d33a0d7dad79f3d514349b0ba321121b80fe
treec9c25913c6594aece028b07f8019eba8fd69a657
parentaf7949fdea2f3115c82143178a22a39afe7bbde1
parent582963a8156522582e55466be4a59974a8d909a5
Merge commit '582963a8156522582e55466be4a59974a8d909a5'

* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
libavcodec/vdpau_vc1.c

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