On Tue, 13 Feb 2018 02:04:18 -0300 James Almer <[email protected]> wrote:
> On 2/13/2018 1:50 AM, wm4 wrote: > > On Tue, 13 Feb 2018 01:44:22 -0300 > > James Almer <[email protected]> wrote: > > > >> On 2/13/2018 1:33 AM, wm4 wrote: > >>> --- > >>> If anyone knows of similar still remaining cases in the codebase, please > >>> tell me, and I'll send patches. > >>> --- > >>> libavcodec/avcodec.h | 49 > >>> ++++++++++++++++--------------------------------- > >>> libavcodec/utils.c | 5 ----- > >>> libavcodec/version.h | 2 +- > >>> 3 files changed, 17 insertions(+), 39 deletions(-) > >>> > >>> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > >>> index bc0eacd66b..b3dad5d614 100644 > >>> --- a/libavcodec/avcodec.h > >>> +++ b/libavcodec/avcodec.h > >>> @@ -409,8 +409,7 @@ enum AVCodecID { > >>> AV_CODEC_ID_DXV, > >>> AV_CODEC_ID_SCREENPRESSO, > >>> AV_CODEC_ID_RSCC, > >>> - > >>> - AV_CODEC_ID_Y41P = 0x8000, > >>> + AV_CODEC_ID_Y41P, > >>> AV_CODEC_ID_AVRP, > >>> AV_CODEC_ID_012V, > >>> AV_CODEC_ID_AVUI, > >>> @@ -480,14 +479,11 @@ 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, > >>> - > >>> - /* various ADPCM codecs */ > >>> - AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, > >>> + AV_CODEC_ID_ADPCM_IMA_QT, > >> > >> This is not an ABI compat offset. It's to separate PCM from ADPCM > >> codecs. It's also in libav's avcodec.h > > > > I could reword the commit message. Unless you argue we should keep the > > codec "categorization"; in that case entire patch dropped. > > I'd rather keep them, yes. At any point we could add any of the missing > PCM codecs, or new ADPCM codecs, just to give an example, and these > offsets will prevent having to dump them at the bottom of the list. I also removed the comments and empty lines that indicate the sectioning, so new codecs would always be appended at the end of the list of each codec type. > This patch LGTM if removing the ABI compat offsets only, so up to you. _______________________________________________ ffmpeg-devel mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
