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)
commitb123d82c4182fc3842376ac1e078ec63bcd2e20c
tree69c59ad4afd9cafbd5372a16b288447d72ee3675
parent1b82b934a166e60f64e966eaa97512ba9dcb615b
parentb10b6ac7a902f28e09e37a29c392e2f0c19e9526
Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'

* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

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