diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:27:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:27:54 +0100 |
| commit | dac87995295eeb45954b473f24e67ac7d103ba43 (patch) | |
| tree | 6d1df49645b1989aecdbc3aef8031b13858b806b /ffserver.c | |
| parent | 32fdfdfbdac64c57b12910521af1379a24d01f73 (diff) | |
| parent | ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 (diff) | |
| download | ffmpeg-dac87995295eeb45954b473f24e67ac7d103ba43.tar.gz | |
Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'
* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
lavc: stop setting AVFrame.motion_subsample_log2
avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ffserver.c b/ffserver.c index eee83e5695..1a9f13c734 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4545,14 +4545,6 @@ static int parse_ffconfig(const char *filename) ERROR("VideoQMin out of range\n"); } } - } else if (!av_strcasecmp(cmd, "LumaElim")) { - get_arg(arg, sizeof(arg), &p); - if (stream) - video_enc.luma_elim_threshold = atoi(arg); - } else if (!av_strcasecmp(cmd, "ChromaElim")) { - get_arg(arg, sizeof(arg), &p); - if (stream) - video_enc.chroma_elim_threshold = atoi(arg); } else if (!av_strcasecmp(cmd, "LumiMask")) { get_arg(arg, sizeof(arg), &p); if (stream) |