[FFmpeg-cvslog] Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 19:35:37 2013 +0100| [fee484edaff77fc831d4cbbdd259ea0948103f86] | committer: Michael Niedermayer

Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'

* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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