Merge commit '54307b35311e9a871b3d8ecb2b2eecfc16de0163'

[ffmpeg] / libavformat / mpjpeg.c

diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 3904ccb2b43f3ebf8e701d61801cab42d8de1786..80f83c58719d604936b5f3b702a2e037f1149fca 100644 (file)
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -23,7 +23,7 @@
 
 /* Multipart JPEG */
 
-#define BOUNDARY_TAG "ffserver"
+#define BOUNDARY_TAG "ffmpeg"
 
 typedef struct MPJPEGContext {
     AVClass *class;