diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-07-29 22:11:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:38:28 +0200 |
| commit | 2d582d142c185fbf7bc9240903423c9bbac7784f (patch) | |
| tree | c4fd93279ad78c3a977458c58805b0fc4715174b | |
| parent | d2b0aae5e1b298075c7e840828b67a4236669f78 (diff) | |
| download | ffmpeg-2d582d142c185fbf7bc9240903423c9bbac7784f.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 ca9b2829d6..19bdfc3afd 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -186,7 +186,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++) |