Merge commit '161a301d44274645c2272855dac3e4664f935603'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:10:20 +0000 (00:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:11:32 +0000 (00:11 +0200)
commit17498b70d8b733804723b63a9f80c35f206daadf
treef773db6313868ca876996f377990e4fbaccdff39
parent2a33dc2cdf6d62204f6f5c425c185d714403daa6
parent161a301d44274645c2272855dac3e4664f935603
Merge commit '161a301d44274645c2272855dac3e4664f935603'

* commit '161a301d44274645c2272855dac3e4664f935603':
  mpjpeg: Write the Content-length

Conflicts:
libavformat/mpjpeg.c

See: 0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpjpeg.c