[FFmpeg-cvslog] Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 14:02:43 2013 +0200| [ab16d5b7b56e66fefab75292d6a0e0f731a8966d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab16d5b7b56e66fefab75292d6a0e0f731a8966d
---