Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 09:58:03 +0000 (10:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Oct 2014 09:58:12 +0000 (10:58 +0100)
* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893':
  vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP

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

Simple merge