Merge commit '70946e605924e2108c39f96faa369c220177f301'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 17:25:31 +0000 (14:25 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 17:25:31 +0000 (14:25 -0300)
commitd49ca877d0e4cd953a28be41f3df8724f0179918
tree576c2374596c851ce3c45a04d52466e7acf3198e
parentbc987cf91dd9975b0949bb5f91b9f266ca53e0ff
parent70946e605924e2108c39f96faa369c220177f301
Merge commit '70946e605924e2108c39f96faa369c220177f301'

* commit '70946e605924e2108c39f96faa369c220177f301':
  h264dec: Fix mix of lossless and lossy MBs decoding
  h264_cabac: Fix CABAC+8x8dct in 4:4:4
  h264dec: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction

This commit is a noop, see
6f7ca1f55be1270e0d7c33409de4473e4dd00add
840b41b2a643fc8f0617c0370125a19c02c6b586
cf231b68da1150c100114f2c5671b7ed740f917a

Merged-by: James Almer <jamrial@gmail.com>