Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 12:17:40 +0000 (14:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 12:17:40 +0000 (14:17 +0200)
commit067d11bf71e87d6bcc6a12eb302d6281a0d2408d
tree30b1c837669dcc718e3366cf04c9edaa61e8e969
parentec6a855b3a6b87f3415cc4ecfc685bd2eefc6a80
parent502cde409ca5ee97ef70c2cdede88b9101746ff6
Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'

* commit '502cde409ca5ee97ef70c2cdede88b9101746ff6':
  vdpau: force reinitialization when output resolution changes

Conflicts:
libavcodec/vdpau.c

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