Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'
authorClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 13:38:11 +0000 (15:38 +0200)
committerClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 13:38:11 +0000 (15:38 +0200)
* commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69':
  h264: remove pointless setting of some variables in loop_filter

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/h264_slice.c

Simple merge