From ed118841eab962105b1afc896bfd4def5bd1725c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 26 Feb 2009 13:00:13 +0000 Subject: don't trigger metadata compatibility code when user app already set metadata using new API Originally committed as revision 17608 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/metadata_compat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/metadata_compat.c b/libavformat/metadata_compat.c index ef4bdb5db1..b05fb04bce 100644 --- a/libavformat/metadata_compat.c +++ b/libavformat/metadata_compat.c @@ -118,6 +118,9 @@ void ff_metadata_mux_compat(AVFormatContext *ctx) { int i; + if (ctx->metadata && ctx->metadata->count > 0) + return; + FILL_METADATA_STR(ctx, title); FILL_METADATA_STR(ctx, author); FILL_METADATA_STR(ctx, copyright); -- cgit v1.2.3