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

fixes issue1568

Originally committed as revision 20921 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 3fa72c356b..c828242be8 100644
--- a/ffmpeg.c
+++ b/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;
             }