10l

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index 448fb657941fd3bd800f0a126e1f4f2dce69af6d..2f3eae7ea28744191593607c66d8e0cf29178535 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -2119,7 +2119,7 @@ static int http_prepare_data(HTTPContext *c)
                             /* XXX: potential leak */
                             return -1;
                         }
-                        if (av_write_packet(ctx, &pkt, pkt.pts)) {
+                        if (av_write_frame(ctx, pkt.stream_index, pkt.data, pkt.size)) {
                             c->state = HTTPSTATE_SEND_DATA_TRAILER;
                         }
                         
@@ -3296,7 +3296,7 @@ void add_codec(FFStream *stream, AVCodecContext *av)
         if (!av->rc_eq)
             av->rc_eq = "tex^qComp";
         if (!av->i_quant_factor)
-            av->i_quant_factor = 0.8;
+            av->i_quant_factor = -0.8;
         if (!av->b_quant_factor)
             av->b_quant_factor = 1.25;
         if (!av->b_quant_offset)
@@ -3759,6 +3759,26 @@ int parse_ffconfig(const char *filename)
                     errors++;
                 }
             }
+        } else if (!strcasecmp(cmd, "LumaElim")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                video_enc.luma_elim_threshold = atoi(arg);
+            }
+        } else if (!strcasecmp(cmd, "ChromaElim")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                video_enc.chroma_elim_threshold = atoi(arg);
+            }
+        } else if (!strcasecmp(cmd, "LumiMask")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                video_enc.lumi_masking = atof(arg);
+            }
+        } else if (!strcasecmp(cmd, "DarkMask")) {
+            get_arg(arg, sizeof(arg), &p);
+            if (stream) {
+                video_enc.dark_masking = atof(arg);
+            }
         } else if (!strcasecmp(cmd, "NoVideo")) {
             video_id = CODEC_ID_NONE;
         } else if (!strcasecmp(cmd, "NoAudio")) {