[FFmpeg-cvslog] libx264: support passing arbitrary parameters.
Michael Niedermayer
git at videolan.org
Wed May 18 17:18:24 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 18 15:39:40 2011 +0200| [d1f9621d39b80add240d09daf1328ceae613bcd4] | committer: Michael Niedermayer
libx264: support passing arbitrary parameters.
Idea taken from mencoder. This should fix conflicts with presets as long as
the new system is used.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1f9621d39b80add240d09daf1328ceae613bcd4
---
libavcodec/libx264.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index eae21fe..519dc51 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -42,6 +42,7 @@ typedef struct X264Context {
int fastfirstpass;
char *stats;
char *weightp;
+ char *x264opts;
} X264Context;
static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -344,6 +345,17 @@ static av_cold int X264_init(AVCodecContext *avctx)
OPT_STR("level", x4->level);
+ if(x4->x264opts){
+ const char *p= x4->x264opts;
+ while(p){
+ char param[256]={0}, val[256]={0};
+ sscanf(p, "%255[^:=]=%255[^:]", param, val);
+ OPT_STR(param, val);
+ p= strchr(p, ':');
+ p+=!!p;
+ }
+ }
+
if (x4->fastfirstpass)
x264_param_apply_fastfirstpass(&x4->params);
@@ -416,6 +428,7 @@ static const AVOption options[] = {
{"level", "Specify level (as defined by Annex A)", OFFSET(level), FF_OPT_TYPE_STRING, 0, 0, 0, VE},
{"passlogfile", "Filename for 2 pass stats", OFFSET(stats), FF_OPT_TYPE_STRING, 0, 0, 0, VE},
{"wpredp", "Weighted prediction for P-frames", OFFSET(weightp), FF_OPT_TYPE_STRING, 0, 0, 0, VE},
+ {"x264opts", "x264 options", OFFSET(x264opts), FF_OPT_TYPE_STRING, 0, 0, 0, VE},
{ NULL },
};
More information about the ffmpeg-cvslog
mailing list