[FFmpeg-devel] [PATCH 1/5] API: add AV_PKT_DATA_MPEGTS_DESC_6A to AVPacketSideDataType

[Andreas Rheinhardt]

lance.lmwang at gmail.com:
> From: Limin Wang <lance.lmwang at gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
>  doc/APIchanges        | 3 +++
>  libavcodec/avpacket.c | 1 +
>  libavcodec/packet.h   | 7 +++++++
>  libavcodec/version.h  | 2 +-
>  4 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 72a4833..2c76fdc 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -15,6 +15,9 @@ libavutil:     2017-10-21
>  
>  API changes, most recent first:
>  
> +2020-07-xx - xxxxxxxxxx - lavc 58.98.102 - packet.h
> +  Add AV_PKT_DATA_MPEGTS_DESC_6A.
> +
>  2020-07-xx - xxxxxxxxxx - lavu 56.57.100 - cpu.h
>    Add AV_CPU_FLAG_MMI and AV_CPU_FLAG_MSA.
>  
> diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
> index 4801163..0e88112 100644
> --- a/libavcodec/avpacket.c
> +++ b/libavcodec/avpacket.c
> @@ -401,6 +401,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
>      case AV_PKT_DATA_ICC_PROFILE:                return "ICC Profile";
>      case AV_PKT_DATA_DOVI_CONF:                  return "DOVI configuration record";
>      case AV_PKT_DATA_S12M_TIMECODE:              return "SMPTE ST 12-1:2014 timecode";
> +    case AV_PKT_DATA_MPEGTS_DESC_6A:             return "ETSI 300 468 descriptor 0x6A(AC-3)";
>      }
>      return NULL;
>  }
> diff --git a/libavcodec/packet.h b/libavcodec/packet.h
> index 0a19a0e..a18824a 100644
> --- a/libavcodec/packet.h
> +++ b/libavcodec/packet.h
> @@ -291,6 +291,13 @@ enum AVPacketSideDataType {
>      AV_PKT_DATA_S12M_TIMECODE,
>  
>      /**
> +     * ETSI 300 468 descriptor 0x6A(AC-3)
> +     * Refer to: ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
> +     * Tags are stored in struct AVDescriptor6A.

I don't know this struct; it has to be added before the commit adding
the new side data.

> +     */
> +    AV_PKT_DATA_MPEGTS_DESC_6A,
> +
> +    /**
>       * The number of side data types.
>       * This is not part of the public API/ABI in the sense that it may
>       * change when new side data types are added.
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index 291e6b5..4750e25 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -28,7 +28,7 @@
>  #include "libavutil/version.h"
>  
>  #define LIBAVCODEC_VERSION_MAJOR  58
> -#define LIBAVCODEC_VERSION_MINOR  97
> +#define LIBAVCODEC_VERSION_MINOR  98
>  #define LIBAVCODEC_VERSION_MICRO 102
>  
You need to reset micro when updating minor.

>  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
>