| Message ID | 20210503132116.1334-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | d055af5e7ba96b7d2c72a2ff0d7b7d614c2b46a7 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/codec_id: remove unnecessary offsets from AVCodecID | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
lgtm On Mon, May 3, 2021 at 3:21 PM James Almer <jamrial@gmail.com> wrote: > They are no longer required. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/codec_id.h | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h > index ab7bc68ee2..3cfa8f9459 100644 > --- a/libavcodec/codec_id.h > +++ b/libavcodec/codec_id.h > @@ -246,8 +246,7 @@ enum AVCodecID { > AV_CODEC_ID_MSP2, > AV_CODEC_ID_VVC, > #define AV_CODEC_ID_H266 AV_CODEC_ID_VVC > - > - AV_CODEC_ID_Y41P = 0x8000, > + AV_CODEC_ID_Y41P, > AV_CODEC_ID_AVRP, > AV_CODEC_ID_012V, > AV_CODEC_ID_AVUI, > @@ -341,8 +340,7 @@ enum AVCodecID { > AV_CODEC_ID_PCM_S24LE_PLANAR, > AV_CODEC_ID_PCM_S32LE_PLANAR, > AV_CODEC_ID_PCM_S16BE_PLANAR, > - > - AV_CODEC_ID_PCM_S64LE = 0x10800, > + AV_CODEC_ID_PCM_S64LE, > AV_CODEC_ID_PCM_S64BE, > AV_CODEC_ID_PCM_F16LE, > AV_CODEC_ID_PCM_F24LE, > @@ -381,8 +379,7 @@ enum AVCodecID { > AV_CODEC_ID_ADPCM_G722, > AV_CODEC_ID_ADPCM_IMA_APC, > AV_CODEC_ID_ADPCM_VIMA, > - > - AV_CODEC_ID_ADPCM_AFC = 0x11800, > + AV_CODEC_ID_ADPCM_AFC, > AV_CODEC_ID_ADPCM_IMA_OKI, > AV_CODEC_ID_ADPCM_DTK, > AV_CODEC_ID_ADPCM_IMA_RAD, > @@ -415,8 +412,7 @@ enum AVCodecID { > AV_CODEC_ID_INTERPLAY_DPCM, > AV_CODEC_ID_XAN_DPCM, > AV_CODEC_ID_SOL_DPCM, > - > - AV_CODEC_ID_SDX2_DPCM = 0x14800, > + AV_CODEC_ID_SDX2_DPCM, > AV_CODEC_ID_GREMLIN_DPCM, > AV_CODEC_ID_DERF_DPCM, > > @@ -489,8 +485,7 @@ enum AVCodecID { > AV_CODEC_ID_ON2AVC, > AV_CODEC_ID_DSS_SP, > AV_CODEC_ID_CODEC2, > - > - AV_CODEC_ID_FFWAVESYNTH = 0x15800, > + AV_CODEC_ID_FFWAVESYNTH, > AV_CODEC_ID_SONIC, > AV_CODEC_ID_SONIC_LS, > AV_CODEC_ID_EVRC, > @@ -529,8 +524,7 @@ enum AVCodecID { > AV_CODEC_ID_HDMV_PGS_SUBTITLE, > AV_CODEC_ID_DVB_TELETEXT, > AV_CODEC_ID_SRT, > - > - AV_CODEC_ID_MICRODVD = 0x17800, > + AV_CODEC_ID_MICRODVD, > AV_CODEC_ID_EIA_608, > AV_CODEC_ID_JACOSUB, > AV_CODEC_ID_SAMI, > @@ -554,7 +548,7 @@ enum AVCodecID { > > AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of > program stream. > AV_CODEC_ID_EPG, > - AV_CODEC_ID_BINTEXT = 0x18800, > + AV_CODEC_ID_BINTEXT, > AV_CODEC_ID_XBIN, > AV_CODEC_ID_IDF, > AV_CODEC_ID_OTF, > -- > 2.31.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index ab7bc68ee2..3cfa8f9459 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -246,8 +246,7 @@ enum AVCodecID { AV_CODEC_ID_MSP2, AV_CODEC_ID_VVC, #define AV_CODEC_ID_H266 AV_CODEC_ID_VVC - - AV_CODEC_ID_Y41P = 0x8000, + AV_CODEC_ID_Y41P, AV_CODEC_ID_AVRP, AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, @@ -341,8 +340,7 @@ enum AVCodecID { AV_CODEC_ID_PCM_S24LE_PLANAR, AV_CODEC_ID_PCM_S32LE_PLANAR, AV_CODEC_ID_PCM_S16BE_PLANAR, - - AV_CODEC_ID_PCM_S64LE = 0x10800, + AV_CODEC_ID_PCM_S64LE, AV_CODEC_ID_PCM_S64BE, AV_CODEC_ID_PCM_F16LE, AV_CODEC_ID_PCM_F24LE, @@ -381,8 +379,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_G722, AV_CODEC_ID_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_VIMA, - - AV_CODEC_ID_ADPCM_AFC = 0x11800, + AV_CODEC_ID_ADPCM_AFC, AV_CODEC_ID_ADPCM_IMA_OKI, AV_CODEC_ID_ADPCM_DTK, AV_CODEC_ID_ADPCM_IMA_RAD, @@ -415,8 +412,7 @@ enum AVCodecID { AV_CODEC_ID_INTERPLAY_DPCM, AV_CODEC_ID_XAN_DPCM, AV_CODEC_ID_SOL_DPCM, - - AV_CODEC_ID_SDX2_DPCM = 0x14800, + AV_CODEC_ID_SDX2_DPCM, AV_CODEC_ID_GREMLIN_DPCM, AV_CODEC_ID_DERF_DPCM, @@ -489,8 +485,7 @@ enum AVCodecID { AV_CODEC_ID_ON2AVC, AV_CODEC_ID_DSS_SP, AV_CODEC_ID_CODEC2, - - AV_CODEC_ID_FFWAVESYNTH = 0x15800, + AV_CODEC_ID_FFWAVESYNTH, AV_CODEC_ID_SONIC, AV_CODEC_ID_SONIC_LS, AV_CODEC_ID_EVRC, @@ -529,8 +524,7 @@ enum AVCodecID { AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT, AV_CODEC_ID_SRT, - - AV_CODEC_ID_MICRODVD = 0x17800, + AV_CODEC_ID_MICRODVD, AV_CODEC_ID_EIA_608, AV_CODEC_ID_JACOSUB, AV_CODEC_ID_SAMI, @@ -554,7 +548,7 @@ enum AVCodecID { AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream. AV_CODEC_ID_EPG, - AV_CODEC_ID_BINTEXT = 0x18800, + AV_CODEC_ID_BINTEXT, AV_CODEC_ID_XBIN, AV_CODEC_ID_IDF, AV_CODEC_ID_OTF,
They are no longer required. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/codec_id.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)