Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:25:08 +0000 (14:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:25:26 +0000 (14:25 +0200)
commitc3b29023207850fa3b5b6b4dcb8e4940b86abb83
tree36d9ce6c2f8647b333e7cc025d39074ae00c8480
parent50fb8c1114b9c2b7d299cbc17a18a457d12069a8
parent2852740e23f91d6775714d7cc29b9a73e1111ce0
Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_internal.h
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c