diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-07-29 22:11:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 19:27:45 +0200 |
| commit | c809cf1c5b1b66fbc14795f3de0dde41c6861356 (patch) | |
| tree | 492987c295416998d997f5d4fe3afb7f53f48206 | |
| parent | 5e833d958c09e79be873f40df88d75425132ba16 (diff) | |
| download | ffmpeg-c809cf1c5b1b66fbc14795f3de0dde41c6861356.tar.gz | |
rawdec: fix mjpeg probing
There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bf51fcd304d5594a4d8eed2bedf0ef0f68fa65f8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/rawdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index bbb76b6c95..6a9085a925 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -188,7 +188,7 @@ static int mjpeg_probe(AVProbeData *p) } if (nb_invalid*4 + 1 < nb_frames) { - static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n\r\n"; + static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n"; int i; for (i=0; i<FFMIN(p->buf_size - sizeof(ct_jpeg), 100); i++) |