Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:44:59 +0000 (13:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:44:59 +0000 (13:44 +0200)
* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/vdpau.h
libavcodec/version.h

Simple merge
Simple merge