Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:04:51 +0000 (11:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 10:05:12 +0000 (11:05 +0100)
commitdd5123a04c67f74024128447e8ca9642241d6d45
treeb826779137aa92bc258fed7fa318c8aa0b1e799f
parentab9ba8887705e3a1db946e7f992bd5cf411f1f04
parentce91b2eae6ea52fc1a7003566d26db20ca62d745
Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'

* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
  vdpau: return MAIN instead of BASELINE for H.264 CBP

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