[FFmpeg-devel] [PATCH] ffmpeg.c: copy global metadata by default.

[Stefano Sabatini]

On date Wednesday 2010-06-02 11:20:13 +0200, Anton Khirnov encoded:
> On Wed, Mar 31, 2010 at 11:15:05AM +0200, Michael Niedermayer wrote:
> ---
>  doc/APIchanges         |    3 +++
>  libavformat/avformat.h |   15 ++++++++++++++-
>  libavformat/metadata.c |   22 ++++++++++++++++++++++
>  3 files changed, 39 insertions(+), 1 deletions(-)
> 
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 3bb05c1..0f2d1db 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -12,6 +12,9 @@ libavutil:   2009-03-08
>  
>  API changes, most recent first:
>  
> +2010-xx-xx - rxxxxx - lavf 52.68.0 - metadata API
> +  Add av_metadata_copy().
> +
>  2010-06-01 - r31301 - lsws 0.11.0 - convertPalette API
>    Add sws_convertPalette8ToPacked32 and sws_convertPalette8ToPacked24
>  
> diff --git a/libavformat/avformat.h b/libavformat/avformat.h
> index 80dc5c3..6d83c24 100644
> --- a/libavformat/avformat.h
> +++ b/libavformat/avformat.h
> @@ -22,7 +22,7 @@
>  #define AVFORMAT_AVFORMAT_H
>  
>  #define LIBAVFORMAT_VERSION_MAJOR 52
> -#define LIBAVFORMAT_VERSION_MINOR 67
> +#define LIBAVFORMAT_VERSION_MINOR 68
>  #define LIBAVFORMAT_VERSION_MICRO  0
>  
>  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
> @@ -173,6 +173,19 @@ void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv,
>   */
>  void av_metadata_free(AVMetadata **m);
> +/**
> + * Copy metadata from src to dst, converting it from src_conv format to

Copies.

> + * dst_conv. Existing metadata in dst is left untouched. dst may be empty
> + * (i.e. a pointer to NULL), in which case it is created.
> + * @param pattern Used to copy only some keys. If non-NULL, it is passed

Empty newline before the first @param.

> + *                directly to av_metadata_get().
> + * @param flags   Passed directly to av_metadata_get/set. If pattern is NULL,
> + *                defaults to AV_METADATA_IGNORE_SUFFIX|AV_METADATA_DONT_OVERWRITE.
> + */
> +void av_metadata_copy(AVMetadata  *src, const AVMetadataConv *src_conv,
> +                      AVMetadata **dst, const AVMetadataConv *dst_conv,
> +                      const uint8_t *pattern, int flags);
> +
>  
>  /* packet functions */  

[...]

Regards.
-- 
FFmpeg = Funny Fantastic Multimedia Ponderous Explosive Guru