On Sat, Jun 28, 2014 at 8:02 AM, Kieran Kunhya <[email protected]> wrote:
> ---
> doc/APIchanges | 4 ++++
> libavcodec/avcodec.h | 5 ++++-
> libavcodec/version.h | 5 ++++-
> libavutil/frame.h | 4 ++++
> libavutil/version.h | 4 ++--
> 5 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 4714012..dd46d06 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,10 @@ libavutil: 2013-12-xx
>
> API changes, most recent first:
>
> +2014-06-xx - xxxxxxx - lavc 55.57.0 - avcodec.h
lavc 55.55.1, but it's safe to skip mentioning it here, users will
check for lavu anyway.
> +2014-06-xx - xxxxxxx - lavu 53.18.0 - frame.h
> + Deprecate AVCodecContext.dtg_active_format and use side-data instead
(nit) end with fullstop, but committer will take care of this and above.
> +
> 2014-06-xx - xxxxxxx - lavu 53.17.0 - imgutils.h
> Add av_image_check_sar().
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index cc74aee..b48217c 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -1493,6 +1493,7 @@ typedef struct AVCodecContext {
> */
> int me_subpel_quality;
>
> +#if FF_API_AFD
> /**
> * DTG active format information (additional aspect ratio
> * information only used in DVB MPEG-2 transport streams)
> @@ -1500,8 +1501,9 @@ typedef struct AVCodecContext {
> *
> * - encoding: unused
> * - decoding: Set by decoder.
> + * @deprecated Deprecated in favour of AVSideData
> */
> - int dtg_active_format;
> + attribute_deprecated int dtg_active_format;
> #define FF_DTG_AFD_SAME 8
> #define FF_DTG_AFD_4_3 9
> #define FF_DTG_AFD_16_9 10
> @@ -1509,6 +1511,7 @@ typedef struct AVCodecContext {
> #define FF_DTG_AFD_4_3_SP_14_9 13
> #define FF_DTG_AFD_16_9_SP_14_9 14
> #define FF_DTG_AFD_SP_4_3 15
> +#endif
No replacement for all these defines?
> /**
> * maximum motion estimation search range in subpel units
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index dee6615..0ac5cff 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -30,7 +30,7 @@
>
> #define LIBAVCODEC_VERSION_MAJOR 55
> #define LIBAVCODEC_VERSION_MINOR 55
> -#define LIBAVCODEC_VERSION_MICRO 0
> +#define LIBAVCODEC_VERSION_MICRO 1
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> LIBAVCODEC_VERSION_MINOR, \
> @@ -144,5 +144,8 @@
> #ifndef FF_API_CODEC_NAME
> #define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 57)
> #endif
> +#ifndef FF_API_AFD
> +#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 57)
> +#endif
>
> #endif /* AVCODEC_VERSION_H */
> diff --git a/libavutil/frame.h b/libavutil/frame.h
> index b2159d3..0d76f1d 100644
> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -82,6 +82,10 @@ enum AVFrameSideDataType {
> * See libavutil/display.h for a detailed description of the data.
> */
> AV_FRAME_DATA_DISPLAYMATRIX,
> + /**
> + * Active Format Description data as specified in ETSI TS 101 154
> + */
> + AV_FRAME_DATA_AFD,
> };
>
> typedef struct AVFrameSideData {
> diff --git a/libavutil/version.h b/libavutil/version.h
> index ef38404..a2625b5 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -54,8 +54,8 @@
> */
>
> #define LIBAVUTIL_VERSION_MAJOR 53
> -#define LIBAVUTIL_VERSION_MINOR 17
> -#define LIBAVUTIL_VERSION_MICRO 1
> +#define LIBAVUTIL_VERSION_MINOR 18
> +#define LIBAVUTIL_VERSION_MICRO 0
>
> #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
> LIBAVUTIL_VERSION_MINOR, \
> --
> 1.7.9.5
Seems ok otherwise.
--
Vittorio
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
