Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Jan 2014 11:47:31 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Jan 2014 11:47:31 +0000 (12:47 +0100)
commita0e9dfb5ae5ed45090065612744e4bec10f033bf
treeb275c059e962c1035ee4467f1430215bb34e508d
parent367245857399cd0429136136bade305a49e5d8fb
parent50866c8d95bfd97c299199aec0d68291f38a72e1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: fix bugs in updating coef probabilities with parallelmode=1

Conflicts:
libavcodec/vp9.c

No change, the bug/buggy code doesnt seem to be in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>