virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avformat/img2dec: Little JFIF / Exif cleanup

Browse Source 
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>
(cherry picked from commit 5712f36dd0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-06-03 00:56:31 +02:00
parent 2ea4dfd684
commit b8ee22e1dd
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/img2dec.c
View File

@ -795,11 +795,13 @@ static int jpeg_probe(const AVProbeData *p)
state = EOI; state = EOI;
break; break;
case APP0: 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; got_header = 1;
/* fallthrough */
case APP1: 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; got_header = 1;
/* fallthrough */
case APP2: case APP2:
case APP3: case APP3:
case APP4: case APP4: