Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 09:41:39 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 09:45:54 +0000 (11:45 +0200)
commitda0f67b177adaa3f792038bff174d015da1179a4
tree61ae8fb8084737f7a2925d7b78ff4330291e1e33
parent82654172ced59236744bb7aceba822462f6b5750
parentbd7b4da0f4627bb6c4a7c2575da83fe6b261a21c
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'

* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
libavcodec/8bps.c

See: 66ff90f4a3d81c25feaa672dc8cc9cc88017753d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/8bps.c