Do not copy codec_tag in stream copy case if it is associated with a different codec_id

fixes issue1568


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20921 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ffmpeg.c

@@ -1854,7 +1854,7 @@ static int av_encode(AVFormatContext **output_files,
 
             if(!codec->codec_tag){
                 if(   !os->oformat->codec_tag
-                   || av_codec_get_id (os->oformat->codec_tag, icodec->codec_tag) > 0
+                   || av_codec_get_id (os->oformat->codec_tag, icodec->codec_tag) == codec->codec_id
                    || av_codec_get_tag(os->oformat->codec_tag, icodec->codec_id) <= 0)
                     codec->codec_tag = icodec->codec_tag;
             }