diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-06-03 00:56:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-06-12 00:39:12 +0200 |
| commit | 5712f36dd0ee0144b92edd2147e24b3724d7ec89 (patch) | |
| tree | 86d094ef49bd13de072f102ea26613367e7e4c32 | |
| parent | 7d04c6016b0971fecb890d3a0afe4e6706a1a68e (diff) | |
| download | ffmpeg-5712f36dd0ee0144b92edd2147e24b3724d7ec89.tar.gz | |
avformat/img2dec: Little JFIF / Exif cleanup
This changes the behavior and makes it behave how it probably was intended.
Either way this is unlikely to result in any user visible change
Fixes: CID1494637 Missing break in switch
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/img2dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index f8c1c0f313..ba52353074 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -795,11 +795,13 @@ static int jpeg_probe(const AVProbeData *p) state = EOI; break; case APP0: - if (AV_RL32(&b[i + 4]) == MKTAG('J','F','I','F')) + if (c == APP0 && AV_RL32(&b[i + 4]) == MKTAG('J','F','I','F')) got_header = 1; + /* fallthrough */ case APP1: - if (AV_RL32(&b[i + 4]) == MKTAG('E','x','i','f')) + if (c == APP1 && AV_RL32(&b[i + 4]) == MKTAG('E','x','i','f')) got_header = 1; + /* fallthrough */ case APP2: case APP3: case APP4: |