[FFmpeg-cvslog] Merge commit '4e70d66ded537cadd32dbd02a38c3d86a203c812'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 20 11:43:20 2013 +0100| [54b0bef390edc0fbee91bf731bf0a686fadc9907] | committer: Michael Niedermayer

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 at gmx.at>

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