Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:59:16 +0000 (15:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:59:20 +0000 (15:59 +0100)
commit7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a
treedd2396b97502947a1b8d12bee9918da828d895e9
parentad6cee117e83711bf57e8dd90472543dbd61b8b8
parente6c90ce94f1b07f50cea2babf7471af455cca0ff
Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'

* commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff':
  h264: move loopfilter parameters into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/h264.h
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_slice.c
libavcodec/vaapi_h264.c