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)
* 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>

Trivial merge