[SCM] libav/experimental: ffmpeg.c: Don't use NULL for integer metadata flags.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 660822f0aebf37a8b3a9a89e0fb27096f17a5a42
Author: Alex Converse <alex.converse at gmail.com>
Date:   Thu Mar 4 11:27:39 2010 +0000

    ffmpeg.c: Don't use NULL for integer metadata flags.
    
    Originally committed as revision 22205 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 4220c27..25f4558 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1850,7 +1850,7 @@ static int av_encode(AVFormatContext **output_files,
         while ((t = av_metadata_get(ist->st->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
             if (lang && !strcmp(t->key, "language"))
                 continue;
-            av_metadata_set2(&ost->st->metadata, t->key, t->value, NULL);
+            av_metadata_set2(&ost->st->metadata, t->key, t->value, 0);
         }
 
         ost->st->disposition = ist->st->disposition;

-- 
Libav/FFmpeg packaging