Merge commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:55:51 +0000 (12:55 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:55:51 +0000 (12:55 +0100)
commitb95b8e5a2269f8fe6c137a5994b7d273545993d9
tree90dcb26dc84c7f84e52ef83232b61eec669c54d3
parent7daac50067cbc3b6a4d677ac3f3574258659c2f6
parent18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74
Merge commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74'

* commit '18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74':
  mpjpeg: Cope with multipart lacking the initial CRLF

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/mpjpegdec.c