Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:07:53 +0000 (16:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:07:53 +0000 (16:07 +0100)
commitda7f4c32ab6bf517d4ef51297da46cf459479b22
tree63d729fabc2501ad6d9dc2c5bdfc241f274307fe
parent04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42
parent9951907f6fc37a8d41566dbee09f7c15ff587de6
Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'

* commit '9951907f6fc37a8d41566dbee09f7c15ff587de6':
  h264: move redundant_pic_count into the per-slice context

Conflicts:
libavcodec/h264.c

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