Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 12:02:43 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 12:02:43 +0000 (14:02 +0200)
commitab16d5b7b56e66fefab75292d6a0e0f731a8966d
treec1dd80a18fa3fd799793168e8b6449e4b5982d12
parent8610751d07bc4c82a8e0cf416c39e845884e6b4d
parenta90905db2e6ab1840890f3a88bfd3bf008b9d886
Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'

* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
  ffv1: Assume bitdepth 0 means 8bit

Conflicts:
libavcodec/ffv1dec.c

Note, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>