virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge commit '161a301d44274645c2272855dac3e4664f935603'

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

Conflicts:
	libavformat/mpjpeg.c

See: 0d2f4eedc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-07-09 00:10:20 +02:00
parent 2a33dc2cdf 161a301d44
commit 17498b70d8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpjpeg.c
View File

@@ -42,7 +42,8 @@ static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
{
MPJPEGContext *mpj = s->priv_data;
avio_printf(s->pb, "Content-type: image/jpeg\r\n");
avio_printf(s->pb, "Content-length: %d\r\n\r\n", pkt->size);
avio_printf(s->pb, "Content-length: %d\r\n\r\n",
pkt->size);
avio_write(s->pb, pkt->data, pkt->size);
avio_printf(s->pb, "\r\n--%s\r\n", mpj->boundary_tag);