mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-06-11 08:13:06 +00:00
avcodec/jpegls: rename SOF48 to SOF55
SOF48 (0xf0) was used in a public draft of the standard (FCD 14495). In the final specification it is called SOF55 (0xf7).
This commit is contained in:
@@ -373,7 +373,7 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt,
|
||||
|
||||
/* write our own JPEG header, can't use mjpeg_picture_header */
|
||||
put_marker_byteu(&pb, SOI);
|
||||
put_marker_byteu(&pb, SOF48);
|
||||
put_marker_byteu(&pb, SOF55);
|
||||
bytestream2_put_be16u(&pb, 8 + comps * 3); // header size depends on components
|
||||
bytestream2_put_byteu(&pb, (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8); // bpp
|
||||
bytestream2_put_be16u(&pb, avctx->height);
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@ enum JpegMarker {
|
||||
JPG4 = 0xf4,
|
||||
JPG5 = 0xf5,
|
||||
JPG6 = 0xf6,
|
||||
SOF48 = 0xf7, ///< JPEG-LS
|
||||
SOF55 = 0xf7, ///< JPEG-LS
|
||||
LSE = 0xf8, ///< JPEG-LS extension parameters
|
||||
JPG9 = 0xf9,
|
||||
JPG10 = 0xfa,
|
||||
|
||||
@@ -2431,7 +2431,7 @@ redo_for_pal8:
|
||||
ret = -1;
|
||||
|
||||
if (!CONFIG_JPEGLS_DECODER &&
|
||||
(start_code == SOF48 || start_code == LSE)) {
|
||||
(start_code == SOF55 || start_code == LSE)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "JPEG-LS support not enabled.\n");
|
||||
return AVERROR(ENOSYS);
|
||||
}
|
||||
@@ -2442,7 +2442,7 @@ redo_for_pal8:
|
||||
case SOF1:
|
||||
case SOF2:
|
||||
case SOF3:
|
||||
case SOF48:
|
||||
case SOF55:
|
||||
break;
|
||||
default:
|
||||
goto skip;
|
||||
@@ -2496,7 +2496,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
if ((ret = ff_mjpeg_decode_sof(s)) < 0)
|
||||
goto fail;
|
||||
break;
|
||||
case SOF48:
|
||||
case SOF55:
|
||||
avctx->profile = AV_PROFILE_MJPEG_JPEG_LS;
|
||||
#if FF_API_CODEC_PROPS
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
@@ -2591,7 +2591,7 @@ eoi_parser:
|
||||
case SOF1:
|
||||
case SOF2:
|
||||
case SOF3:
|
||||
case SOF48:
|
||||
case SOF55:
|
||||
s->got_picture = 0;
|
||||
goto the_end_no_picture;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user