Merge commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:14:08 +0000 (09:14 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:14:08 +0000 (09:14 +0200)
* commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b':
  vp7: bound checking in vp7_decode_frame_header

Only partially merged, see 46f72ea507afee6adb0d2324848159063d0e7afc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/vp8.c

Simple merge