summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-27 20:43:05 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-27 20:43:05 +0000
commit6379fb900a4070035ed1de4052cd0d92cd7a92da (patch)
tree9ea72915c285427f084405a90c5700a24f889dcd /mencoder.c
parent8596930cc0cd6fa694ee737e15e3f5b9e4165681 (diff)
downloadmpv-6379fb900a4070035ed1de4052cd0d92cd7a92da.tar.bz2
mpv-6379fb900a4070035ed1de4052cd0d92cd7a92da.tar.xz
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13167 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index 668aa1b2ac..faa06ac65a 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -9,6 +9,7 @@
#define VCODEC_QTVIDEO 10
#define VCODEC_NUV 11
#define VCODEC_RAW 12
+#define VCODEC_X264 13
#define ACODEC_COPY 0
#define ACODEC_PCM 1
@@ -708,7 +709,8 @@ default:
sh_video->vfilter=vf_open_encoder(NULL,"qtvideo",(char *)mux_v); break;
case VCODEC_NUV:
sh_video->vfilter=vf_open_encoder(NULL,"nuv",(char *)mux_v); break;
-
+ case VCODEC_X264:
+ sh_video->vfilter=vf_open_encoder(NULL,"x264",(char *)mux_v); break;
}
if(!mux_v->bih || !sh_video->vfilter){
mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed);