Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:36:12 +0000 (14:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:36:53 +0000 (14:36 +0100)
commit4063bb212e18a0dac17133905526b09b4fab5415
tree549369cc63728d0c786b8926928ee4e060cb3418
parent577b39aea221ddc9606f3b5ca698516155cdfd43
parentd5e83122bdc39b9c0278b9b4f6c49baa99223bd6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set Picture.owner2 to the current thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/mpegvideo.c