ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Jul 9
00:10:20 2015 +0200| [17498b70d8b733804723b63a9f80c35f206daadf] | committer:
Michael Niedermayer
Merge commit '161a301d44274645c2272855dac3e4664f935603'
* commit '161a301d44274645c2272855dac3e4664f935603':
mpjpeg: Write the Content-length
Conflicts:
libavformat/mpjpeg.c
See: 0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17498b70d8b733804723b63a9f80c35f206daadf
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
