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>

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/mpegvideo.c
Simple merge