|
|
|
@@ -2119,6 +2119,8 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
ret = mjpeg_decode_com(s); |
|
|
|
if (ret < 0) |
|
|
|
return ret; |
|
|
|
} else if (start_code == DQT) { |
|
|
|
ff_mjpeg_decode_dqt(s); |
|
|
|
} |
|
|
|
|
|
|
|
ret = -1; |
|
|
|
@@ -2151,9 +2153,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
s->restart_count = 0; |
|
|
|
/* nothing to do on SOI */ |
|
|
|
break; |
|
|
|
case DQT: |
|
|
|
ff_mjpeg_decode_dqt(s); |
|
|
|
break; |
|
|
|
case DHT: |
|
|
|
if ((ret = ff_mjpeg_decode_dht(s)) < 0) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); |
|
|
|
|