summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-12-25 21:01:16 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-12-25 21:01:16 +0000
commit37ce3d6ba7b8765ea50f34e411adb4fb89e6293a (patch)
treefc85642798f35ce493c335611cbe68546f83a991 /ffmpeg.c
parenta6831e885c4b1474e3fc135741c9726719a409e0 (diff)
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
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
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;
}