Merge commit '4e70d66ded537cadd32dbd02a38c3d86a203c812'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:43:20 +0000 (11:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:43:29 +0000 (11:43 +0100)
commit54b0bef390edc0fbee91bf731bf0a686fadc9907
tree3d9e0f8b46846f4bbe5bb288c633db74460a5725
parentdf804041bd42d79b8cd01d7599c0d1f69c4027ee
parent4e70d66ded537cadd32dbd02a38c3d86a203c812
Merge commit '4e70d66ded537cadd32dbd02a38c3d86a203c812'

* commit '4e70d66ded537cadd32dbd02a38c3d86a203c812':
  mpegvideo: fix allocation of the hwaccel_picture_private data
  lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting.

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