summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-02-26 13:00:13 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-02-26 13:00:13 +0000
commited118841eab962105b1afc896bfd4def5bd1725c (patch)
tree4e561b35355ad7acf1f048b82476fd5a7f4f32dd /libavformat
parente34a5996b9c73d6cac7413f4e5411f69356c89db (diff)
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
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/metadata_compat.c3
1 files changed, 3 insertions, 0 deletions
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);