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)
* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
  vdpau: return MAIN instead of BASELINE for H.264 CBP

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

Simple merge