Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:49:13 +0000 (23:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:49:13 +0000 (23:49 +0200)
commitfa0f7c024e90a5337892cbc3b78e936ba5d25cf3
tree8e83e3ad53663a6bb0bbf6b381d6f1a9b82521ec
parent8d19dd91a51c296c92a9d94ab9541a3cb7316bab
parenta871ef0cc936612bdb0e643196be72efcf0c8986
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'

* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
  hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/h264_slice.c
libavcodec/mpegvideo.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c