[FFmpeg-cvslog] r20921 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Fri Dec 25 22:01:16 2009
New Revision: 20921

Log:
Do not copy codec_tag in stream copy case if it is associated with a different codec_id
fixes issue1568

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Dec 25 19:32:16 2009	(r20920)
+++ trunk/ffmpeg.c	Fri Dec 25 22:01:16 2009	(r20921)
@@ -1854,7 +1854,7 @@ static int av_encode(AVFormatContext **o
 
             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;
             }