Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:38 +0000 (13:45 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:45:38 +0000 (13:45 +0200)
commitd0bf83ff1dd3a3858a299cc4795ede14b335cc1c
tree3713068335c0d1a1d6a0720f7c5965915e8f5978
parent4b7685b6c626a159e759a5167af11abef9c7802c
parenta41e5e192ed8f79f6607f978dee3205580ba5039
Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039'

* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039':
  vdpau: fix constrained baseline fallback

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