Michael Niedermayer 17498b70d8 Merge commit '161a301d44274645c2272855dac3e4664f935603' ...

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

Conflicts:
	libavformat/mpjpeg.c

See: 0d2f4eedc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-07-09 00:11:32 +02:00

2.6 KiB

Raw Blame History

View Raw