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:
authorPeter Schlaile <peter@schlaile.de>2006-06-09 23:48:50 +0400
committerPeter Schlaile <peter@schlaile.de>2006-06-09 23:48:50 +0400
commitf78be8bdcd295dab18a45825b981405520a53805 (patch)
tree9cc90f18e47d22985d254486a6c4063892b0b668 /source/blender/blenkernel/BKE_writeffmpeg.h
parentbfe1d7c53e41d0f9913e231cf3066d2d7e31605e (diff)
==FFMPEG==
Added support for XVid and H264-codecs in codec-selection. (only work, if ffmpeg is compiled with XVid and/or H264-support. Failure in doing so results in an error message that codec can't be selected.) Both are written always to AVIs since raw-h264-files created by ffmpeg can't even be opened by itself... Video render options are reset to sane defaults (=DVD preset) on startup now. Don't expect quicktime-support to be very exciting, since ffmpeg can't really multiplex quicktime files. (Tried several codecs with the ffmpeg-commandline tool,... sigh) Timestamp crash on Debian-Sarge version is fixed.
Diffstat (limited to 'source/blender/blenkernel/BKE_writeffmpeg.h')
-rw-r--r--source/blender/blenkernel/BKE_writeffmpeg.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 288955f2cba..13084e925e0 100644
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -43,12 +43,16 @@ extern "C" {
#define FFMPEG_AVI 3
#define FFMPEG_MOV 4
#define FFMPEG_DV 5
+#define FFMPEG_H264 6
+#define FFMPEG_XVID 7
#define FFMPEG_CODEC_MPEG1 0
#define FFMPEG_CODEC_MPEG2 1
#define FFMPEG_CODEC_MPEG4 2
#define FFMPEG_CODEC_HUFFYUV 3
#define FFMPEG_CODEC_DV 4
+#define FFMPEG_CODEC_H264 5
+#define FFMPEG_CODEC_XVID 6
#define FFMPEG_PRESET_NONE 0
#define FFMPEG_PRESET_DVD 1