[FFmpeg-cvslog] Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 14:25:08 2013 +0200| [c3b29023207850fa3b5b6b4dcb8e4940b86abb83] | committer: Michael Niedermayer

Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'

* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
  vdpau: store picture data in picture's rather than codec's context

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

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