Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2010-09-13 16:56:39 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-09-13 16:56:39 +0400
commitba2a9ae88ec3dd70bfd9ed7099789d0d5befe407 (patch)
treee9b63ea83b60f93fbd7681b1d9cb2732fda290f9 /source/blender/blenkernel/intern/writeffmpeg.c
parent74f060bfe5d57ae784dcc9bf7e6c9a565875cdb2 (diff)
Fix [#22612] FFMPEG writes incorrect Xvid FourCC code
Reported by Karl Nyman When XVID is chosen for FFMPEG make sure that XVID is written for FourCC code.
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 8ebf98ef930..6cd207f628c 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -515,6 +515,7 @@ static AVStream* alloc_video_stream(RenderData *rd, int codec_id, AVFormatContex
if (codec_id == CODEC_ID_XVID) {
/* arghhhh ... */
c->pix_fmt = PIX_FMT_YUV420P;
+ c->codec_tag = (('D'<<24) + ('I'<<16) + ('V'<<8) + 'X');
}
if (codec_id == CODEC_ID_H264) {