[FFmpeg-cvslog] Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 14:17:40 2014 +0200| [067d11bf71e87d6bcc6a12eb302d6281a0d2408d] | committer: Michael Niedermayer

Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'

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

Conflicts:
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=067d11bf71e87d6bcc6a12eb302d6281a0d2408d
---