diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
| commit | 7d1c3fc1d683d53982a1dec14f0f9749a07ae48d (patch) | |
| tree | 23a9984eef372f9710641e2cb6f302ea9af1727f /ffserver.c | |
| parent | 80adda8efd35c920c7ba0c43d530102a2fd22bc3 (diff) | |
| download | ffmpeg-7d1c3fc1d683d53982a1dec14f0f9749a07ae48d.tar.gz | |
rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c
Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index d48c7c7a71..04b3bfc627 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4220,11 +4220,11 @@ static int parse_ffconfig(const char *filename) } } else if (!strcasecmp(cmd, "VideoHighQuality")) { if (stream) { - video_enc.flags |= CODEC_FLAG_HQ; + video_enc.mb_decision = FF_MB_DECISION_BITS; } } else if (!strcasecmp(cmd, "Video4MotionVector")) { if (stream) { - video_enc.flags |= CODEC_FLAG_HQ; + video_enc.mb_decision = FF_MB_DECISION_BITS; //FIXME remove video_enc.flags |= CODEC_FLAG_4MV; } } else if (!strcasecmp(cmd, "VideoQDiff")) { |