[FFmpeg-cvslog] mpjpeg: Use proper CR/LF in multipart headers

Martin Storsjö git at videolan.org
Tue Oct 31 01:59:04 EET 2017


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed May 10 23:57:20 2017 +0300| [6ccf76aec73b2cd598bb1e65d126d8a12540c411] | committer: Martin Storsjö

mpjpeg: Use proper CR/LF in multipart headers

This is more correct.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ccf76aec73b2cd598bb1e65d126d8a12540c411
---

 libavformat/mpjpeg.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 1a78c32274..3b78cab225 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -26,7 +26,7 @@
 
 static int mpjpeg_write_header(AVFormatContext *s)
 {
-    avio_printf(s->pb, "--%s\n", BOUNDARY_TAG);
+    avio_printf(s->pb, "--%s\r\n", BOUNDARY_TAG);
     avio_flush(s->pb);
     return 0;
 }
@@ -34,12 +34,12 @@ static int mpjpeg_write_header(AVFormatContext *s)
 static int mpjpeg_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     avio_printf(s->pb,
-                "Content-length: %i\n"
-                "Content-type: image/jpeg\n\n",
+                "Content-length: %i\r\n"
+                "Content-type: image/jpeg\r\n\r\n",
                 pkt->size);
     avio_write(s->pb, pkt->data, pkt->size);
 
-    avio_printf(s->pb, "\n--%s\n", BOUNDARY_TAG);
+    avio_printf(s->pb, "\r\n--%s\r\n", BOUNDARY_TAG);
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list