[SCM] libav/experimental: ffmpeg.c: allow using negative file indices to disable metadata copying

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7b3937360efd16ae87fa44fc4633a74913b5ac4d
Author: Anton Khirnov <wyskas at gmail.com>
Date:   Mon Nov 8 06:47:41 2010 +0000

    ffmpeg.c: allow using negative file indices to disable metadata copying
    
    Originally committed as revision 25706 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index fc1d52b..b1cdf1c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2346,6 +2346,8 @@ static int transcode(AVFormatContext **output_files,
 
         int out_file_index = meta_data_maps[i][0].file;
         int in_file_index = meta_data_maps[i][1].file;
+        if (in_file_index < 0 || out_file_index < 0)
+            continue;
         METADATA_CHECK_INDEX(out_file_index, nb_output_files, "output file")
         METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file")
 

-- 
Libav/FFmpeg packaging