Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:45 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:49 +0000 (14:39 +0100)
commitbd76a4822f989f30c6dc109a5157d6239a6b1112
tree0d113eea02fe7fa2ad853f8f891470387801a6c9
parent20477a4ecbeeb4abe4fe896731312836955435f0
parentee0d774dfa94655e44707ff3e02f4a4d282c1963
Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'

* commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963':
  h264: move dist_scale_factor[_field] into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_slice.c