Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)
commitfee484edaff77fc831d4cbbdd259ea0948103f86
treeb8b7ba5d51cbb3da036a9e28534575aa8419e4ca
parentd9d97f9b3374ee740a6f7218aecb0f5d6cec8f57
parentad0c9f2d5d81e22207c6ccecc426bf7306acc327
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@gmx.at>
libavcodec/avcodec.h
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/version.h