From 37ce3d6ba7b8765ea50f34e411adb4fb89e6293a Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 25 Dec 2009 21:01:16 +0000
Subject: [PATCH] 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
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 3fa72c356b7..c828242be88 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;
}
--
GitLab