[SCM] libav/experimental: 10l

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8857a7ef32439b6cadea6707effd686786919084
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Apr 18 21:59:42 2004 +0000

    10l
    
    Originally committed as revision 3034 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index c035cc3..95a6420 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2652,8 +2652,8 @@ static void opt_output_file(const char *filename)
             exit(1);
         }
     } else {
-        use_video = file_oformat->video_codec != CODEC_ID_NONE;
-        use_audio = file_oformat->audio_codec != CODEC_ID_NONE;
+        use_video = file_oformat->video_codec != CODEC_ID_NONE || video_stream_copy;
+        use_audio = file_oformat->audio_codec != CODEC_ID_NONE || audio_stream_copy;
 
         /* disable if no corresponding type found and at least one
            input file */

-- 
Libav/FFmpeg packaging