diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-02 14:57:41 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:39:02 +0200 |
| commit | 8238bc0b5e3dba271217b1223a901b3f9713dc6e (patch) | |
| tree | 2809c5b9d9b26042d584c92afeb76b059484c00f /libavcodec/mjpegdec.c | |
| parent | 0c6e5f321bf5c4054e8b98232692465b342b42b4 (diff) | |
| download | ffmpeg-8238bc0b5e3dba271217b1223a901b3f9713dc6e.tar.gz | |
avcodec/defs: Add AV_PROFILE_* defines, deprecate FF_PROFILE_* defines
These defines are also used in other contexts than just AVCodecContext
ones, e.g. in libavformat. Furthermore, given that these defines are
public, the AV-prefix is the right one, so deprecate (and not just move)
the FF-macros.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0a8f3d68dd..29f281231c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2486,9 +2486,9 @@ redo_for_pal8: case SOF0: case SOF1: if (start_code == SOF0) - s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT; + s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT; else - s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT; + s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT; s->lossless = 0; s->ls = 0; s->progressive = 0; @@ -2496,7 +2496,7 @@ redo_for_pal8: goto fail; break; case SOF2: - s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT; + s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT; s->lossless = 0; s->ls = 0; s->progressive = 1; @@ -2504,7 +2504,7 @@ redo_for_pal8: goto fail; break; case SOF3: - s->avctx->profile = FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS; + s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_LOSSLESS; s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 0; @@ -2513,7 +2513,7 @@ redo_for_pal8: goto fail; break; case SOF48: - s->avctx->profile = FF_PROFILE_MJPEG_JPEG_LS; + s->avctx->profile = AV_PROFILE_MJPEG_JPEG_LS; s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 1; |