# HG changeset patch
# User darkshikari
# Date 1259078057 0
# Node ID de6eb16c2b5b583d55e7766fd89d4dbe8d9f6717
# Parent  3528d151a57ed6653c1f1aee57a86d31ef7b890c
Update ffserver to include all basic x264 parameters in .ffm files.

diff -r 3528d151a57e -r de6eb16c2b5b ffmdec.c
--- a/ffmdec.c	Tue Nov 24 07:08:17 2009 +0000
+++ b/ffmdec.c	Tue Nov 24 15:54:17 2009 +0000
@@ -336,6 +336,19 @@
             codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
             codec->codec_tag = get_be32(pb);
             codec->thread_count = get_byte(pb);
+            codec->coder_type = get_be32(pb);
+            codec->me_cmp = get_be32(pb);
+            codec->partitions = get_be32(pb);
+            codec->me_subpel_quality = get_be32(pb);
+            codec->me_range = get_be32(pb);
+            codec->keyint_min = get_be32(pb);
+            codec->scenechange_threshold = get_be32(pb);
+            codec->b_frame_strategy = get_be32(pb);
+            codec->qcompress = av_int2dbl(get_be64(pb));
+            codec->qblur = av_int2dbl(get_be64(pb));
+            codec->max_qdiff = get_be32(pb);
+            codec->refs = get_be32(pb);
+            codec->directpred = get_be32(pb);
             break;
         case CODEC_TYPE_AUDIO:
             codec->sample_rate = get_be32(pb);
diff -r 3528d151a57e -r de6eb16c2b5b ffmenc.c
--- a/ffmenc.c	Tue Nov 24 07:08:17 2009 +0000
+++ b/ffmenc.c	Tue Nov 24 15:54:17 2009 +0000
@@ -154,6 +154,19 @@
             put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
             put_be32(pb, codec->codec_tag);
             put_byte(pb, codec->thread_count);
+            put_be32(pb, codec->coder_type);
+            put_be32(pb, codec->me_cmp);
+            put_be32(pb, codec->partitions);
+            put_be32(pb, codec->me_subpel_quality);
+            put_be32(pb, codec->me_range);
+            put_be32(pb, codec->keyint_min);
+            put_be32(pb, codec->scenechange_threshold);
+            put_be32(pb, codec->b_frame_strategy);
+            put_be64(pb, av_dbl2int(codec->qcompress));
+            put_be64(pb, av_dbl2int(codec->qblur));
+            put_be32(pb, codec->max_qdiff);
+            put_be32(pb, codec->refs);
+            put_be32(pb, codec->directpred);
             break;
         case CODEC_TYPE_AUDIO:
             put_be32(pb, codec->sample_rate);