Message ID | GV1P250MB073761CAA155ACAE04CA1FA98F569@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel] avcodec/mjpegdec: Fix compilation | expand |
On 9/30/2022 2:23 PM, Andreas Rheinhardt wrote: > Regression since 9a494b82d998823d0de68cb6b8db83cc451d1781. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/mjpegdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 85d1129f30..3374ae71bd 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -596,7 +596,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > case 0x14111100: > case 0x22211100: > case 0x22112100: > - if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[B] == 'B') { > + if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[2] == 'B') { > if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP; > else > goto unk_pixfmt; LGTM, so please push.
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 85d1129f30..3374ae71bd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -596,7 +596,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x14111100: case 0x22211100: case 0x22112100: - if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[B] == 'B') { + if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[2] == 'B') { if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP; else goto unk_pixfmt;
Regression since 9a494b82d998823d0de68cb6b8db83cc451d1781. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)