Release 0.10.2

Original commit message from CVS:
Release 0.10.2

2 files changed, 3814 insertions, 87 deletions

diff --git a/docs/plugins/gst-ffmpeg-plugins.args b/docs/plugins/gst-ffmpeg-plugins.args
index 709d062..e587460 100644
--- a/docs/plugins/gst-ffmpeg-plugins.args
+++ b/docs/plugins/gst-ffmpeg-plugins.args
@@ -55,7 +55,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -105,7 +105,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -155,7 +155,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -205,7 +205,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -255,7 +255,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -305,7 +305,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -319,6 +319,566 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_flv::b-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Factor</NICK>
+<BLURB>Factor in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::b-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Offset</NICK>
+<BLURB>Offset in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::bitrate-tolerance</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,100000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bitrate Tolerance</NICK>
+<BLURB>Number of bits the bitstream is allowed to diverge from the reference.</BLURB>
+<DEFAULT>8000000</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::chroma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Chroma Elimination Threshold</NICK>
+<BLURB>Chroma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::dark-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Darkness Masking</NICK>
+<BLURB>Darkness Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::dct-algo</NAME>
+<TYPE>GstFFMpegDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DCT Algorithm</NICK>
+<BLURB>DCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::flags</NAME>
+<TYPE>GstFFMpegFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flags</NICK>
+<BLURB>Flags.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::i-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Factor</NICK>
+<BLURB>Factor in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::i-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Offset</NICK>
+<BLURB>Offset in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::idct-algo</NAME>
+<TYPE>GstFFMpegIDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>IDCT Algorithm</NICK>
+<BLURB>IDCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::ildct-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced DCT Compare Function</NICK>
+<BLURB>Interlaced DCT Compare Function.</BLURB>
+<DEFAULT>VSAD</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::inter-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Inter Quantizer Bias</NICK>
+<BLURB>Inter Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::interlaced</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced Material</NICK>
+<BLURB>Interlaced Material.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::intra-dc-precision</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra DC precision</NICK>
+<BLURB>Precision of the Intra DC coefficient - 8.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::intra-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra Quantizer Bias</NICK>
+<BLURB>Intra Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::last-predictor-count</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Last Predictor Count</NICK>
+<BLURB>Amount of previous Motion Vector predictors.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::lmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Lagrange Multiplier</NICK>
+<BLURB>Maximum Lagrange Multiplier.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::lmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Lagrange Multiplier</NICK>
+<BLURB>Minimum Lagrange Multiplier.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::luma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma Elimination Threshold</NICK>
+<BLURB>Luma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::lumi-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luminance Masking</NICK>
+<BLURB>Luminance Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::max-bframes</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max B-Frames</NICK>
+<BLURB>Maximum B-frames in a row.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::max-key-interval</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= -100</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Key Interval</NICK>
+<BLURB>Maximum number of frames between two keyframes (< 0 is in sec).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::max-qdiff</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer Difference</NICK>
+<BLURB>Maximum Quantizer Difference between frames.</BLURB>
+<DEFAULT>3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::mb-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Compare Function</NICK>
+<BLURB>Macroblok Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::mb-decision</NAME>
+<TYPE>GstFFMpegEncMBDecision</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Decision</NICK>
+<BLURB>Macroblok Decision Mode.</BLURB>
+<DEFAULT>Use method set by mb-cmp</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::mb-qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum MB Quantizer</NICK>
+<BLURB>Maximum MB Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::mb-qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum MB Quantizer</NICK>
+<BLURB>Minimum MB Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::me-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Compare Function</NICK>
+<BLURB>Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::me-pre-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Compare Function</NICK>
+<BLURB>Motion Estimation Pre Pass Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::me-range</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Range</NICK>
+<BLURB>Motion Estimation search range in subpel units.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::me-sub-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subpixel Motion Estimation Compare Function</NICK>
+<BLURB>Subpixel Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::me-subpel-quality</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,8]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Subpixel Quality</NICK>
+<BLURB>Motion Estimation Subpixel Refinement Quality.</BLURB>
+<DEFAULT>8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::noise-reduction</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Noise Reduction</NICK>
+<BLURB>Noise Reduction Strength.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::p-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>P Block Masking</NICK>
+<BLURB>P Block  Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::pass</NAME>
+<TYPE>GstFFMpegEncPass</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Encoding pass/type</NICK>
+<BLURB>Encoding pass/type.</BLURB>
+<DEFAULT>Constant Bitrate Encoding</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::pre-dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::pre-me</NAME>
+<TYPE>GstFFMpegEncPreME</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pre Pass for Motion Estimation</NICK>
+<BLURB>Pre Pass for Motion Estimation.</BLURB>
+<DEFAULT>Only after I-frames</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::qblur</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Smoothing</NICK>
+<BLURB>Quantizer Smoothing over time.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::qcompress</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Change</NICK>
+<BLURB>Quantizer Change between easy and hard scenes.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer</NICK>
+<BLURB>Maximum Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Quantizer</NICK>
+<BLURB>Minimum Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::quant-type</NAME>
+<TYPE>GstFFMpegEncQuantTypes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Type</NICK>
+<BLURB>Quantizer Type.</BLURB>
+<DEFAULT>H263 quantization</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::quantizer</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,30]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Constant Quantizer</NICK>
+<BLURB>Constant Quantizer.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-buffer-aggressivity</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Aggressivity</NICK>
+<BLURB>Ratecontrol Buffer Aggressivity.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-buffer-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Size</NICK>
+<BLURB>Decoder bitstream buffer size.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-eq</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Equation</NICK>
+<BLURB>Ratecontrol Equation.</BLURB>
+<DEFAULT>"tex^qComp"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-initial-cplx</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1e+07]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Initial Complexity for Pass 1 Ratecontrol</NICK>
+<BLURB>Initial Complexity for Pass 1 Ratecontrol.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-max-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Maximum Bitrate</NICK>
+<BLURB>Ratecontrol Maximum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-min-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Minimum Bitrate</NICK>
+<BLURB>Ratecontrol Minimum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-qmod-amp</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Mod</NICK>
+<BLURB>Ratecontrol Mod.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-qmod-freq</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,0]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Freq</NICK>
+<BLURB>Ratecontrol Freq.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::rc-qsquish</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Limiting Method</NICK>
+<BLURB>0 means limit by clipping, otherwise use nice continuous function.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::spatial-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial Complexity Masking</NICK>
+<BLURB>Spatial Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::statsfile</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Statistics Filename</NICK>
+<BLURB>Filename to store data for 2-pass encoding.</BLURB>
+<DEFAULT>"stats.log"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_flv::temporal-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal Complexity Masking</NICK>
+<BLURB>Temporal Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_rv10::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -355,7 +915,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -405,7 +965,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -455,7 +1015,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -469,6 +1029,566 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_mpeg4::b-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Factor</NICK>
+<BLURB>Factor in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::b-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Offset</NICK>
+<BLURB>Offset in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::bitrate-tolerance</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,100000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bitrate Tolerance</NICK>
+<BLURB>Number of bits the bitstream is allowed to diverge from the reference.</BLURB>
+<DEFAULT>8000000</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::chroma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Chroma Elimination Threshold</NICK>
+<BLURB>Chroma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::dark-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Darkness Masking</NICK>
+<BLURB>Darkness Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::dct-algo</NAME>
+<TYPE>GstFFMpegDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DCT Algorithm</NICK>
+<BLURB>DCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::flags</NAME>
+<TYPE>GstFFMpegFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flags</NICK>
+<BLURB>Flags.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::i-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Factor</NICK>
+<BLURB>Factor in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::i-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Offset</NICK>
+<BLURB>Offset in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::idct-algo</NAME>
+<TYPE>GstFFMpegIDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>IDCT Algorithm</NICK>
+<BLURB>IDCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::ildct-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced DCT Compare Function</NICK>
+<BLURB>Interlaced DCT Compare Function.</BLURB>
+<DEFAULT>VSAD</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::inter-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Inter Quantizer Bias</NICK>
+<BLURB>Inter Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::interlaced</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced Material</NICK>
+<BLURB>Interlaced Material.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::intra-dc-precision</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra DC precision</NICK>
+<BLURB>Precision of the Intra DC coefficient - 8.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::intra-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra Quantizer Bias</NICK>
+<BLURB>Intra Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::last-predictor-count</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Last Predictor Count</NICK>
+<BLURB>Amount of previous Motion Vector predictors.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::lmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Lagrange Multiplier</NICK>
+<BLURB>Maximum Lagrange Multiplier.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::lmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Lagrange Multiplier</NICK>
+<BLURB>Minimum Lagrange Multiplier.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::luma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma Elimination Threshold</NICK>
+<BLURB>Luma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::lumi-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luminance Masking</NICK>
+<BLURB>Luminance Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::max-bframes</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max B-Frames</NICK>
+<BLURB>Maximum B-frames in a row.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::max-key-interval</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= -100</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Key Interval</NICK>
+<BLURB>Maximum number of frames between two keyframes (< 0 is in sec).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::max-qdiff</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer Difference</NICK>
+<BLURB>Maximum Quantizer Difference between frames.</BLURB>
+<DEFAULT>3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::mb-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Compare Function</NICK>
+<BLURB>Macroblok Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::mb-decision</NAME>
+<TYPE>GstFFMpegEncMBDecision</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Decision</NICK>
+<BLURB>Macroblok Decision Mode.</BLURB>
+<DEFAULT>Use method set by mb-cmp</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::mb-qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum MB Quantizer</NICK>
+<BLURB>Maximum MB Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::mb-qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum MB Quantizer</NICK>
+<BLURB>Minimum MB Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::me-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Compare Function</NICK>
+<BLURB>Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::me-pre-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Compare Function</NICK>
+<BLURB>Motion Estimation Pre Pass Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::me-range</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Range</NICK>
+<BLURB>Motion Estimation search range in subpel units.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::me-sub-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subpixel Motion Estimation Compare Function</NICK>
+<BLURB>Subpixel Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::me-subpel-quality</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,8]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Subpixel Quality</NICK>
+<BLURB>Motion Estimation Subpixel Refinement Quality.</BLURB>
+<DEFAULT>8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::noise-reduction</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Noise Reduction</NICK>
+<BLURB>Noise Reduction Strength.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::p-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>P Block Masking</NICK>
+<BLURB>P Block  Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::pass</NAME>
+<TYPE>GstFFMpegEncPass</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Encoding pass/type</NICK>
+<BLURB>Encoding pass/type.</BLURB>
+<DEFAULT>Constant Bitrate Encoding</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::pre-dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::pre-me</NAME>
+<TYPE>GstFFMpegEncPreME</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pre Pass for Motion Estimation</NICK>
+<BLURB>Pre Pass for Motion Estimation.</BLURB>
+<DEFAULT>Only after I-frames</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::qblur</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Smoothing</NICK>
+<BLURB>Quantizer Smoothing over time.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::qcompress</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Change</NICK>
+<BLURB>Quantizer Change between easy and hard scenes.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer</NICK>
+<BLURB>Maximum Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Quantizer</NICK>
+<BLURB>Minimum Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::quant-type</NAME>
+<TYPE>GstFFMpegEncQuantTypes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Type</NICK>
+<BLURB>Quantizer Type.</BLURB>
+<DEFAULT>H263 quantization</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::quantizer</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,30]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Constant Quantizer</NICK>
+<BLURB>Constant Quantizer.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-buffer-aggressivity</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Aggressivity</NICK>
+<BLURB>Ratecontrol Buffer Aggressivity.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-buffer-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Size</NICK>
+<BLURB>Decoder bitstream buffer size.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-eq</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Equation</NICK>
+<BLURB>Ratecontrol Equation.</BLURB>
+<DEFAULT>"tex^qComp"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-initial-cplx</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1e+07]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Initial Complexity for Pass 1 Ratecontrol</NICK>
+<BLURB>Initial Complexity for Pass 1 Ratecontrol.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-max-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Maximum Bitrate</NICK>
+<BLURB>Ratecontrol Maximum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-min-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Minimum Bitrate</NICK>
+<BLURB>Ratecontrol Minimum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-qmod-amp</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Mod</NICK>
+<BLURB>Ratecontrol Mod.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-qmod-freq</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,0]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Freq</NICK>
+<BLURB>Ratecontrol Freq.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::rc-qsquish</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Limiting Method</NICK>
+<BLURB>0 means limit by clipping, otherwise use nice continuous function.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::spatial-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial Complexity Masking</NICK>
+<BLURB>Spatial Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::statsfile</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Statistics Filename</NICK>
+<BLURB>Filename to store data for 2-pass encoding.</BLURB>
+<DEFAULT>"stats.log"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_mpeg4::temporal-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal Complexity Masking</NICK>
+<BLURB>Temporal Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_msmpeg4v1::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -505,7 +1625,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -519,6 +1639,566 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_msmpeg4v1::b-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Factor</NICK>
+<BLURB>Factor in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::b-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Offset</NICK>
+<BLURB>Offset in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::bitrate-tolerance</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,100000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bitrate Tolerance</NICK>
+<BLURB>Number of bits the bitstream is allowed to diverge from the reference.</BLURB>
+<DEFAULT>8000000</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::chroma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Chroma Elimination Threshold</NICK>
+<BLURB>Chroma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::dark-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Darkness Masking</NICK>
+<BLURB>Darkness Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::dct-algo</NAME>
+<TYPE>GstFFMpegDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DCT Algorithm</NICK>
+<BLURB>DCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::flags</NAME>
+<TYPE>GstFFMpegFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flags</NICK>
+<BLURB>Flags.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::i-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Factor</NICK>
+<BLURB>Factor in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::i-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Offset</NICK>
+<BLURB>Offset in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::idct-algo</NAME>
+<TYPE>GstFFMpegIDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>IDCT Algorithm</NICK>
+<BLURB>IDCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::ildct-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced DCT Compare Function</NICK>
+<BLURB>Interlaced DCT Compare Function.</BLURB>
+<DEFAULT>VSAD</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::inter-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Inter Quantizer Bias</NICK>
+<BLURB>Inter Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::interlaced</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced Material</NICK>
+<BLURB>Interlaced Material.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::intra-dc-precision</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra DC precision</NICK>
+<BLURB>Precision of the Intra DC coefficient - 8.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::intra-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra Quantizer Bias</NICK>
+<BLURB>Intra Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::last-predictor-count</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Last Predictor Count</NICK>
+<BLURB>Amount of previous Motion Vector predictors.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::lmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Lagrange Multiplier</NICK>
+<BLURB>Maximum Lagrange Multiplier.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::lmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Lagrange Multiplier</NICK>
+<BLURB>Minimum Lagrange Multiplier.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::luma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma Elimination Threshold</NICK>
+<BLURB>Luma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::lumi-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luminance Masking</NICK>
+<BLURB>Luminance Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::max-bframes</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max B-Frames</NICK>
+<BLURB>Maximum B-frames in a row.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::max-key-interval</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= -100</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Key Interval</NICK>
+<BLURB>Maximum number of frames between two keyframes (< 0 is in sec).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::max-qdiff</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer Difference</NICK>
+<BLURB>Maximum Quantizer Difference between frames.</BLURB>
+<DEFAULT>3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::mb-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Compare Function</NICK>
+<BLURB>Macroblok Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::mb-decision</NAME>
+<TYPE>GstFFMpegEncMBDecision</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Decision</NICK>
+<BLURB>Macroblok Decision Mode.</BLURB>
+<DEFAULT>Use method set by mb-cmp</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::mb-qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum MB Quantizer</NICK>
+<BLURB>Maximum MB Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::mb-qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum MB Quantizer</NICK>
+<BLURB>Minimum MB Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::me-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Compare Function</NICK>
+<BLURB>Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::me-pre-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Compare Function</NICK>
+<BLURB>Motion Estimation Pre Pass Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::me-range</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Range</NICK>
+<BLURB>Motion Estimation search range in subpel units.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::me-sub-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subpixel Motion Estimation Compare Function</NICK>
+<BLURB>Subpixel Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::me-subpel-quality</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,8]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Subpixel Quality</NICK>
+<BLURB>Motion Estimation Subpixel Refinement Quality.</BLURB>
+<DEFAULT>8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::noise-reduction</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Noise Reduction</NICK>
+<BLURB>Noise Reduction Strength.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::p-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>P Block Masking</NICK>
+<BLURB>P Block  Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::pass</NAME>
+<TYPE>GstFFMpegEncPass</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Encoding pass/type</NICK>
+<BLURB>Encoding pass/type.</BLURB>
+<DEFAULT>Constant Bitrate Encoding</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::pre-dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::pre-me</NAME>
+<TYPE>GstFFMpegEncPreME</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pre Pass for Motion Estimation</NICK>
+<BLURB>Pre Pass for Motion Estimation.</BLURB>
+<DEFAULT>Only after I-frames</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::qblur</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Smoothing</NICK>
+<BLURB>Quantizer Smoothing over time.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::qcompress</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Change</NICK>
+<BLURB>Quantizer Change between easy and hard scenes.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer</NICK>
+<BLURB>Maximum Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Quantizer</NICK>
+<BLURB>Minimum Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::quant-type</NAME>
+<TYPE>GstFFMpegEncQuantTypes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Type</NICK>
+<BLURB>Quantizer Type.</BLURB>
+<DEFAULT>H263 quantization</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::quantizer</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,30]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Constant Quantizer</NICK>
+<BLURB>Constant Quantizer.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-buffer-aggressivity</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Aggressivity</NICK>
+<BLURB>Ratecontrol Buffer Aggressivity.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-buffer-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Size</NICK>
+<BLURB>Decoder bitstream buffer size.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-eq</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Equation</NICK>
+<BLURB>Ratecontrol Equation.</BLURB>
+<DEFAULT>"tex^qComp"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-initial-cplx</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1e+07]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Initial Complexity for Pass 1 Ratecontrol</NICK>
+<BLURB>Initial Complexity for Pass 1 Ratecontrol.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-max-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Maximum Bitrate</NICK>
+<BLURB>Ratecontrol Maximum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-min-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Minimum Bitrate</NICK>
+<BLURB>Ratecontrol Minimum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-qmod-amp</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Mod</NICK>
+<BLURB>Ratecontrol Mod.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-qmod-freq</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,0]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Freq</NICK>
+<BLURB>Ratecontrol Freq.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::rc-qsquish</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Limiting Method</NICK>
+<BLURB>0 means limit by clipping, otherwise use nice continuous function.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::spatial-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial Complexity Masking</NICK>
+<BLURB>Spatial Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::statsfile</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Statistics Filename</NICK>
+<BLURB>Filename to store data for 2-pass encoding.</BLURB>
+<DEFAULT>"stats.log"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v1::temporal-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal Complexity Masking</NICK>
+<BLURB>Temporal Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_msmpeg4v2::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -555,7 +2235,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -569,6 +2249,566 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_msmpeg4v2::b-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Factor</NICK>
+<BLURB>Factor in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::b-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Offset</NICK>
+<BLURB>Offset in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::bitrate-tolerance</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,100000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bitrate Tolerance</NICK>
+<BLURB>Number of bits the bitstream is allowed to diverge from the reference.</BLURB>
+<DEFAULT>8000000</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::chroma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Chroma Elimination Threshold</NICK>
+<BLURB>Chroma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::dark-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Darkness Masking</NICK>
+<BLURB>Darkness Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::dct-algo</NAME>
+<TYPE>GstFFMpegDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DCT Algorithm</NICK>
+<BLURB>DCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::flags</NAME>
+<TYPE>GstFFMpegFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flags</NICK>
+<BLURB>Flags.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::i-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Factor</NICK>
+<BLURB>Factor in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::i-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Offset</NICK>
+<BLURB>Offset in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::idct-algo</NAME>
+<TYPE>GstFFMpegIDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>IDCT Algorithm</NICK>
+<BLURB>IDCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::ildct-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced DCT Compare Function</NICK>
+<BLURB>Interlaced DCT Compare Function.</BLURB>
+<DEFAULT>VSAD</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::inter-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Inter Quantizer Bias</NICK>
+<BLURB>Inter Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::interlaced</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced Material</NICK>
+<BLURB>Interlaced Material.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::intra-dc-precision</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra DC precision</NICK>
+<BLURB>Precision of the Intra DC coefficient - 8.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::intra-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra Quantizer Bias</NICK>
+<BLURB>Intra Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::last-predictor-count</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Last Predictor Count</NICK>
+<BLURB>Amount of previous Motion Vector predictors.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::lmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Lagrange Multiplier</NICK>
+<BLURB>Maximum Lagrange Multiplier.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::lmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Lagrange Multiplier</NICK>
+<BLURB>Minimum Lagrange Multiplier.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::luma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma Elimination Threshold</NICK>
+<BLURB>Luma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::lumi-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luminance Masking</NICK>
+<BLURB>Luminance Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::max-bframes</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max B-Frames</NICK>
+<BLURB>Maximum B-frames in a row.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::max-key-interval</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= -100</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Key Interval</NICK>
+<BLURB>Maximum number of frames between two keyframes (< 0 is in sec).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::max-qdiff</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer Difference</NICK>
+<BLURB>Maximum Quantizer Difference between frames.</BLURB>
+<DEFAULT>3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::mb-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Compare Function</NICK>
+<BLURB>Macroblok Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::mb-decision</NAME>
+<TYPE>GstFFMpegEncMBDecision</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Decision</NICK>
+<BLURB>Macroblok Decision Mode.</BLURB>
+<DEFAULT>Use method set by mb-cmp</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::mb-qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum MB Quantizer</NICK>
+<BLURB>Maximum MB Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::mb-qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum MB Quantizer</NICK>
+<BLURB>Minimum MB Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::me-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Compare Function</NICK>
+<BLURB>Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::me-pre-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Compare Function</NICK>
+<BLURB>Motion Estimation Pre Pass Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::me-range</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Range</NICK>
+<BLURB>Motion Estimation search range in subpel units.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::me-sub-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subpixel Motion Estimation Compare Function</NICK>
+<BLURB>Subpixel Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::me-subpel-quality</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,8]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Subpixel Quality</NICK>
+<BLURB>Motion Estimation Subpixel Refinement Quality.</BLURB>
+<DEFAULT>8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::noise-reduction</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Noise Reduction</NICK>
+<BLURB>Noise Reduction Strength.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::p-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>P Block Masking</NICK>
+<BLURB>P Block  Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::pass</NAME>
+<TYPE>GstFFMpegEncPass</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Encoding pass/type</NICK>
+<BLURB>Encoding pass/type.</BLURB>
+<DEFAULT>Constant Bitrate Encoding</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::pre-dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::pre-me</NAME>
+<TYPE>GstFFMpegEncPreME</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pre Pass for Motion Estimation</NICK>
+<BLURB>Pre Pass for Motion Estimation.</BLURB>
+<DEFAULT>Only after I-frames</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::qblur</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Smoothing</NICK>
+<BLURB>Quantizer Smoothing over time.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::qcompress</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Change</NICK>
+<BLURB>Quantizer Change between easy and hard scenes.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer</NICK>
+<BLURB>Maximum Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Quantizer</NICK>
+<BLURB>Minimum Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::quant-type</NAME>
+<TYPE>GstFFMpegEncQuantTypes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Type</NICK>
+<BLURB>Quantizer Type.</BLURB>
+<DEFAULT>H263 quantization</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::quantizer</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,30]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Constant Quantizer</NICK>
+<BLURB>Constant Quantizer.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-buffer-aggressivity</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Aggressivity</NICK>
+<BLURB>Ratecontrol Buffer Aggressivity.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-buffer-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Size</NICK>
+<BLURB>Decoder bitstream buffer size.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-eq</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Equation</NICK>
+<BLURB>Ratecontrol Equation.</BLURB>
+<DEFAULT>"tex^qComp"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-initial-cplx</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1e+07]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Initial Complexity for Pass 1 Ratecontrol</NICK>
+<BLURB>Initial Complexity for Pass 1 Ratecontrol.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-max-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Maximum Bitrate</NICK>
+<BLURB>Ratecontrol Maximum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-min-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Minimum Bitrate</NICK>
+<BLURB>Ratecontrol Minimum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-qmod-amp</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Mod</NICK>
+<BLURB>Ratecontrol Mod.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-qmod-freq</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,0]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Freq</NICK>
+<BLURB>Ratecontrol Freq.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::rc-qsquish</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Limiting Method</NICK>
+<BLURB>0 means limit by clipping, otherwise use nice continuous function.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::spatial-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial Complexity Masking</NICK>
+<BLURB>Spatial Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::statsfile</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Statistics Filename</NICK>
+<BLURB>Filename to store data for 2-pass encoding.</BLURB>
+<DEFAULT>"stats.log"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4v2::temporal-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal Complexity Masking</NICK>
+<BLURB>Temporal Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_msmpeg4::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -605,7 +2845,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -619,6 +2859,566 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_msmpeg4::b-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Factor</NICK>
+<BLURB>Factor in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::b-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>B-Quantizer Offset</NICK>
+<BLURB>Offset in B-Frame Quantizer Computation.</BLURB>
+<DEFAULT>1.25</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::bitrate-tolerance</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,100000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Bitrate Tolerance</NICK>
+<BLURB>Number of bits the bitstream is allowed to diverge from the reference.</BLURB>
+<DEFAULT>8000000</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::chroma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Chroma Elimination Threshold</NICK>
+<BLURB>Chroma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::dark-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Darkness Masking</NICK>
+<BLURB>Darkness Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::dct-algo</NAME>
+<TYPE>GstFFMpegDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>DCT Algorithm</NICK>
+<BLURB>DCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::flags</NAME>
+<TYPE>GstFFMpegFlags</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flags</NICK>
+<BLURB>Flags.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::i-quant-factor</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-31,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Factor</NICK>
+<BLURB>Factor in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0.8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::i-quant-offset</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>I-Quantizer Offset</NICK>
+<BLURB>Offset in P-Frame Quantizer Computation.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::idct-algo</NAME>
+<TYPE>GstFFMpegIDCTAlgo</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>IDCT Algorithm</NICK>
+<BLURB>IDCT Algorithm.</BLURB>
+<DEFAULT>Automatically select a good one</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::ildct-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced DCT Compare Function</NICK>
+<BLURB>Interlaced DCT Compare Function.</BLURB>
+<DEFAULT>VSAD</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::inter-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Inter Quantizer Bias</NICK>
+<BLURB>Inter Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::interlaced</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Interlaced Material</NICK>
+<BLURB>Interlaced Material.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::intra-dc-precision</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra DC precision</NICK>
+<BLURB>Precision of the Intra DC coefficient - 8.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::intra-quant-bias</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-1000000,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Intra Quantizer Bias</NICK>
+<BLURB>Intra Quantizer Bias.</BLURB>
+<DEFAULT>999999</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::last-predictor-count</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Last Predictor Count</NICK>
+<BLURB>Amount of previous Motion Vector predictors.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::lmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Lagrange Multiplier</NICK>
+<BLURB>Maximum Lagrange Multiplier.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::lmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Lagrange Multiplier</NICK>
+<BLURB>Minimum Lagrange Multiplier.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::luma-elim-threshold</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-99,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luma Elimination Threshold</NICK>
+<BLURB>Luma Single Coefficient Elimination Threshold.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::lumi-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Luminance Masking</NICK>
+<BLURB>Luminance Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::max-bframes</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Max B-Frames</NICK>
+<BLURB>Maximum B-frames in a row.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::max-key-interval</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= -100</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Key Interval</NICK>
+<BLURB>Maximum number of frames between two keyframes (< 0 is in sec).</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::max-qdiff</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer Difference</NICK>
+<BLURB>Maximum Quantizer Difference between frames.</BLURB>
+<DEFAULT>3</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::mb-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Compare Function</NICK>
+<BLURB>Macroblok Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::mb-decision</NAME>
+<TYPE>GstFFMpegEncMBDecision</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Macroblock Decision</NICK>
+<BLURB>Macroblok Decision Mode.</BLURB>
+<DEFAULT>Use method set by mb-cmp</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::mb-qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum MB Quantizer</NICK>
+<BLURB>Maximum MB Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::mb-qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum MB Quantizer</NICK>
+<BLURB>Minimum MB Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::me-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Compare Function</NICK>
+<BLURB>Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::me-pre-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Compare Function</NICK>
+<BLURB>Motion Estimation Pre Pass Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::me-range</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,16000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Range</NICK>
+<BLURB>Motion Estimation search range in subpel units.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::me-sub-cmp</NAME>
+<TYPE>GstFFMpegCMPFunction</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Subpixel Motion Estimation Compare Function</NICK>
+<BLURB>Subpixel Motion Estimation Compare Function.</BLURB>
+<DEFAULT>Sum of Absolute Differences</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::me-subpel-quality</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,8]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Subpixel Quality</NICK>
+<BLURB>Motion Estimation Subpixel Refinement Quality.</BLURB>
+<DEFAULT>8</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::noise-reduction</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,1000000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Noise Reduction</NICK>
+<BLURB>Noise Reduction Strength.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::p-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>P Block Masking</NICK>
+<BLURB>P Block  Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::pass</NAME>
+<TYPE>GstFFMpegEncPass</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Encoding pass/type</NICK>
+<BLURB>Encoding pass/type.</BLURB>
+<DEFAULT>Constant Bitrate Encoding</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::pre-dia-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[-2000,2000]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Motion Estimation Pre Pass Diamond Size/Shape</NICK>
+<BLURB>Motion Estimation Diamond Size/Shape.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::pre-me</NAME>
+<TYPE>GstFFMpegEncPreME</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Pre Pass for Motion Estimation</NICK>
+<BLURB>Pre Pass for Motion Estimation.</BLURB>
+<DEFAULT>Only after I-frames</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::qblur</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Smoothing</NICK>
+<BLURB>Quantizer Smoothing over time.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::qcompress</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Change</NICK>
+<BLURB>Quantizer Change between easy and hard scenes.</BLURB>
+<DEFAULT>0.5</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::qmax</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Maximum Quantizer</NICK>
+<BLURB>Maximum Quantizer.</BLURB>
+<DEFAULT>31</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::qmin</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[1,31]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Minimum Quantizer</NICK>
+<BLURB>Minimum Quantizer.</BLURB>
+<DEFAULT>2</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::quant-type</NAME>
+<TYPE>GstFFMpegEncQuantTypes</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quantizer Type</NICK>
+<BLURB>Quantizer Type.</BLURB>
+<DEFAULT>H263 quantization</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::quantizer</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,30]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Constant Quantizer</NICK>
+<BLURB>Constant Quantizer.</BLURB>
+<DEFAULT>0.01</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-buffer-aggressivity</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Aggressivity</NICK>
+<BLURB>Ratecontrol Buffer Aggressivity.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-buffer-size</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Buffer Size</NICK>
+<BLURB>Decoder bitstream buffer size.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-eq</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Equation</NICK>
+<BLURB>Ratecontrol Equation.</BLURB>
+<DEFAULT>"tex^qComp"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-initial-cplx</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,1e+07]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Initial Complexity for Pass 1 Ratecontrol</NICK>
+<BLURB>Initial Complexity for Pass 1 Ratecontrol.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-max-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Maximum Bitrate</NICK>
+<BLURB>Ratecontrol Maximum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-min-rate</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Minimum Bitrate</NICK>
+<BLURB>Ratecontrol Minimum Bitrate.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-qmod-amp</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Mod</NICK>
+<BLURB>Ratecontrol Mod.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-qmod-freq</NAME>
+<TYPE>gint</TYPE>
+<RANGE>[0,0]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Freq</NICK>
+<BLURB>Ratecontrol Freq.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::rc-qsquish</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0,99]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Ratecontrol Limiting Method</NICK>
+<BLURB>0 means limit by clipping, otherwise use nice continuous function.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::spatial-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Spatial Complexity Masking</NICK>
+<BLURB>Spatial Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::statsfile</NAME>
+<TYPE>gchararray</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Statistics Filename</NICK>
+<BLURB>Filename to store data for 2-pass encoding.</BLURB>
+<DEFAULT>"stats.log"</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffenc_msmpeg4::temporal-cplx-masking</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[-1,1]</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Temporal Complexity Masking</NICK>
+<BLURB>Temporal Complexity Masking.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_wmv1::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -655,7 +3455,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -705,7 +3505,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -755,7 +3555,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -805,7 +3605,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -855,7 +3655,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -905,7 +3705,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -955,7 +3755,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1005,7 +3805,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1055,7 +3855,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1105,7 +3905,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1155,7 +3955,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1205,7 +4005,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1219,6 +4019,16 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_huffyuv::prediction-method</NAME>
+<TYPE>GstFFMpegEncPredMethod</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Prediction Method</NICK>
+<BLURB>Prediction Method.</BLURB>
+<DEFAULT>Left</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_ffvhuff::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -1255,7 +4065,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1269,6 +4079,16 @@
 </ARG>
 
 <ARG>
+<NAME>ffenc_ffvhuff::prediction-method</NAME>
+<TYPE>GstFFMpegEncPredMethod</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Prediction Method</NICK>
+<BLURB>Prediction Method.</BLURB>
+<DEFAULT>Left</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>ffenc_asv1::bitrate</NAME>
 <TYPE>gulong</TYPE>
 <RANGE></RANGE>
@@ -1305,7 +4125,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1355,7 +4175,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1405,7 +4225,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1455,7 +4275,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -1505,7 +4325,7 @@
 <FLAGS>rw</FLAGS>
 <NICK>ME Method</NICK>
 <BLURB>Motion Estimation Method.</BLURB>
-<DEFAULT>2</DEFAULT>
+<DEFAULT>4</DEFAULT>
 </ARG>
 
 <ARG>
@@ -4018,3 +6838,763 @@
 <DEFAULT></DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>postproc_default::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_default::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_default::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_forcequant::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_forcequant::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_forcequant::quantizer</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Force Quantizer</NICK>
+<BLURB>Quantizer to use (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_forcequant::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::threshold-1</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threshold One</NICK>
+<BLURB>Higher values mean stronger filtering (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::threshold-2</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threshold Two</NICK>
+<BLURB>Higher values mean stronger filtering (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_tmpnoise::threshold-3</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Threshold Three</NICK>
+<BLURB>Higher values mean stronger filtering (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_lowpass5::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_lowpass5::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_lowpass5::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ffmpegdeint::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ffmpegdeint::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ffmpegdeint::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_mediandeint::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_mediandeint::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_mediandeint::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_cubicipoldeint::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_cubicipoldeint::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_cubicipoldeint::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linipoldeint::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linipoldeint::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linipoldeint::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linblenddeint::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linblenddeint::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_linblenddeint::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_autolevels::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_autolevels::fully-range</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Fully Range</NICK>
+<BLURB>Stretch luminance to (0-255).</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_autolevels::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_autolevels::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_dering::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_dering::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_dering::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_avdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_avdeblock::difference</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Difference Factor</NICK>
+<BLURB>Higher values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_avdeblock::flatness</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flatness Threshold</NICK>
+<BLURB>Lower values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_avdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_avdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ahdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ahdeblock::difference</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Difference Factor</NICK>
+<BLURB>Higher values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ahdeblock::flatness</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flatness Threshold</NICK>
+<BLURB>Lower values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ahdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_ahdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1vdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1vdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1vdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1hdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1hdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_x1hdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_vdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_vdeblock::difference</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Difference Factor</NICK>
+<BLURB>Higher values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_vdeblock::flatness</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flatness Threshold</NICK>
+<BLURB>Lower values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_vdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_vdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_hdeblock::autoq</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>AutoQ</NICK>
+<BLURB>Automatically switch filter off if CPU too slow.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_hdeblock::difference</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Difference Factor</NICK>
+<BLURB>Higher values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_hdeblock::flatness</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= G_MAXULONG</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Flatness Threshold</NICK>
+<BLURB>Lower values mean more deblocking (-1 = pp default).</BLURB>
+<DEFAULT>-1</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_hdeblock::quality</NAME>
+<TYPE>guint</TYPE>
+<RANGE><= 6</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Quality</NICK>
+<BLURB>Quality level of filter (higher is better).</BLURB>
+<DEFAULT>6</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>postproc_hdeblock::scope</NAME>
+<TYPE>GstPostProcPPScope</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Scope</NICK>
+<BLURB>Operate on chrominance and/or luminance.</BLURB>
+<DEFAULT>Chrominance and Luminance filtering</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_flashsv::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_flashsv::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_cavs::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_cavs::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp6f::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp6f::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp6::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp6::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp5::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vp5::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vc1::lowres</NAME>
+<TYPE>GstFFMpegDecLowres</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Low resolution</NICK>
+<BLURB>At which resolution to decode images.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>ffdec_vc1::skip-frame</NAME>
+<TYPE>GstFFMpegDecSkipFrame</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Skip frames</NICK>
+<BLURB>Which types of frames to skip during decoding.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/inspect/plugin-ffmpeg.xml b/docs/plugins/inspect/plugin-ffmpeg.xml
index bff887c..ac5ca1b 100644
--- a/docs/plugins/inspect/plugin-ffmpeg.xml
+++ b/docs/plugins/inspect/plugin-ffmpeg.xml
@@ -3,7 +3,7 @@
   <description>All FFMPEG codecs</description>
   <filename>../../ext/ffmpeg/.libs/libgstffmpeg.so</filename>
   <basename>libgstffmpeg.so</basename>
-  <version>0.10.1</version>
+  <version>0.10.2</version>
   <license>LGPL</license>
   <source>gst-ffmpeg</source>
   <package>FFMpeg</package>
@@ -199,6 +199,13 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
+      <name>ffdec_cavs</name>
+      <longname>FFMPEG Chinese AVS Video decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG cavs decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
       <name>ffdec_cinepak</name>
       <longname>FFMPEG Cinepak video decoder</longname>
       <class>Codec/Decoder/Video</class>
@@ -255,6 +262,13 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
+      <name>ffdec_flashsv</name>
+      <longname>FFMPEG Flash Screen Video decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG flashsv decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
       <name>ffdec_flic</name>
       <longname>FFMPEG FLIC animation video decoder</longname>
       <class>Codec/Decoder/Video</class>
@@ -529,7 +543,7 @@
     </element>
     <element>
       <name>ffdec_qdraw</name>
-      <longname>FFMPEG Applet Quickdraw video decoder</longname>
+      <longname>FFMPEG Apple Quickdraw video decoder</longname>
       <class>Codec/Decoder/Video</class>
       <description>FFMPEG qdraw decoder</description>
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
@@ -689,10 +703,10 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
-      <name>ffdec_vc9</name>
+      <name>ffdec_vc1</name>
       <longname>FFMPEG Microsoft Video Codec v1 decoder</longname>
       <class>Codec/Decoder/Video</class>
-      <description>FFMPEG vc9 decoder</description>
+      <description>FFMPEG vc1 decoder</description>
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
@@ -724,6 +738,27 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
+      <name>ffdec_vp5</name>
+      <longname>FFMPEG VP5 video decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG vp5 decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffdec_vp6</name>
+      <longname>FFMPEG VP6 video decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG vp6 decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffdec_vp6f</name>
+      <longname>FFMPEG VP6 Flash video decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG vp6f decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
       <name>ffdec_vqavideo</name>
       <longname>FFMPEG Westwood VQA video decoder</longname>
       <class>Codec/Decoder/Video</class>
@@ -759,6 +794,13 @@
       <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
+      <name>ffdec_wmv3</name>
+      <longname>FFMPEG Windows Media Video v9 decoder</longname>
+      <class>Codec/Decoder/Video</class>
+      <description>FFMPEG wmv3 decoder</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
       <name>ffdec_wnv1</name>
       <longname>FFMPEG Winnov video 1 decoder</longname>
       <class>Codec/Decoder/Video</class>
@@ -819,287 +861,308 @@
       <longname>FFMPEG 4X Technologies format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG 4X Technologies format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_RoQ</name>
       <longname>FFMPEG Id RoQ format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Id RoQ format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
-    </element>
-    <element>
-      <name>ffdemux_aac</name>
-      <longname>FFMPEG ADTS AAC demuxer</longname>
-      <class>Codec/Demuxer</class>
-      <description>FFMPEG ADTS AAC demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_aiff</name>
       <longname>FFMPEG Audio IFF demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Audio IFF demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+    </element>
+    <element>
+      <name>ffdemux_amr</name>
+      <longname>FFMPEG 3gpp amr file format demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>FFMPEG 3gpp amr file format demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_asf</name>
       <longname>FFMPEG asf format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG asf format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_au</name>
       <longname>FFMPEG SUN AU Format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG SUN AU Format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_avi</name>
       <longname>FFMPEG avi format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG avi format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_avs</name>
       <longname>FFMPEG avs format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG avs format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_daud</name>
       <longname>FFMPEG D-Cinema audio format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG D-Cinema audio format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_dv</name>
       <longname>FFMPEG DV video format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG DV video format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_ea</name>
       <longname>FFMPEG Electronic Arts Multimedia Format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Electronic Arts Multimedia Format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_ffm</name>
       <longname>FFMPEG ffm format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG ffm format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_film_cpk</name>
       <longname>FFMPEG Sega FILM/CPK format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Sega FILM/CPK format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_flic</name>
       <longname>FFMPEG FLI/FLC/FLX animation format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG FLI/FLC/FLX animation format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_flv</name>
       <longname>FFMPEG flv format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG flv format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_gif</name>
       <longname>FFMPEG gif format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG gif format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+    </element>
+    <element>
+      <name>ffdemux_gxf</name>
+      <longname>FFMPEG GXF format demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>FFMPEG GXF format demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_idcin</name>
       <longname>FFMPEG Id CIN format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Id CIN format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_ingenient</name>
       <longname>FFMPEG Ingenient MJPEG demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Ingenient MJPEG demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_ipmovie</name>
       <longname>FFMPEG Interplay MVE format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Interplay MVE format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_matroska</name>
       <longname>FFMPEG Matroska file format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Matroska file format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_mm</name>
       <longname>FFMPEG American Laser Games MM format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG American Laser Games MM format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_mmf</name>
       <longname>FFMPEG mmf format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG mmf format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
-      <name>ffdemux_mov_mp4_m4a_3gp_3g2</name>
-      <longname>FFMPEG QuickTime/MPEG4 format demuxer</longname>
+      <name>ffdemux_mov_mp4_m4a_3gp_3g2_mj2</name>
+      <longname>FFMPEG QuickTime/MPEG4/Motion JPEG 2000 format demuxer</longname>
       <class>Codec/Demuxer</class>
-      <description>FFMPEG QuickTime/MPEG4 format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <description>FFMPEG QuickTime/MPEG4/Motion JPEG 2000 format demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_mp3</name>
       <longname>FFMPEG MPEG audio demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG MPEG audio demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_mpeg</name>
       <longname>FFMPEG MPEG PS format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG MPEG PS format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_mpegts</name>
       <longname>FFMPEG MPEG2 transport stream format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG MPEG2 transport stream format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+    </element>
+    <element>
+      <name>ffdemux_mxf</name>
+      <longname>FFMPEG MXF format demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>FFMPEG MXF format demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_nsv</name>
       <longname>FFMPEG NullSoft Video format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG NullSoft Video format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_nut</name>
       <longname>FFMPEG nut format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG nut format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
-      <name>ffdemux_ogg</name>
-      <longname>FFMPEG Ogg demuxer</longname>
+      <name>ffdemux_nuv</name>
+      <longname>FFMPEG NuppelVideo format demuxer</longname>
       <class>Codec/Demuxer</class>
-      <description>FFMPEG Ogg demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <description>FFMPEG NuppelVideo format demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_psxstr</name>
       <longname>FFMPEG Sony Playstation STR format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Sony Playstation STR format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_rm</name>
       <longname>FFMPEG rm format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG rm format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+    </element>
+    <element>
+      <name>ffdemux_smk</name>
+      <longname>FFMPEG Smacker Video demuxer</longname>
+      <class>Codec/Demuxer</class>
+      <description>FFMPEG Smacker Video demuxer</description>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_sol</name>
       <longname>FFMPEG Sierra SOL Format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Sierra SOL Format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_swf</name>
       <longname>FFMPEG Flash format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Flash format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_tta</name>
       <longname>FFMPEG true-audio demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG true-audio demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_vmd</name>
       <longname>FFMPEG Sierra VMD format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Sierra VMD format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_voc</name>
       <longname>FFMPEG Creative Voice File format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Creative Voice File format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_wav</name>
       <longname>FFMPEG wav format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG wav format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_wc3movie</name>
       <longname>FFMPEG Wing Commander III movie format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Wing Commander III movie format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_wsaud</name>
       <longname>FFMPEG Westwood Studios audio format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Westwood Studios audio format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_wsvqa</name>
       <longname>FFMPEG Westwood Studios VQA format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG Westwood Studios VQA format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffdemux_yuv4mpegpipe</name>
       <longname>FFMPEG YUV4MPEG pipe format demuxer</longname>
       <class>Codec/Demuxer</class>
       <description>FFMPEG YUV4MPEG pipe format demuxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
+      <author>Wim Taymans &lt;wim@fluendo.com&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edward Hervey &lt;bilboed@bilboed.com&gt;</author>
     </element>
     <element>
       <name>ffenc_ac3</name>
@@ -1466,6 +1529,90 @@
       <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
     </element>
     <element>
+      <name>ffmux_3g2</name>
+      <longname>FFMPEG 3g2 Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG 3g2 Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_3gp</name>
+      <longname>FFMPEG 3gp Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG 3gp Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_amr</name>
+      <longname>FFMPEG amr Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG amr Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_asf</name>
+      <longname>FFMPEG asf Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG asf Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_dv</name>
+      <longname>FFMPEG dv Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG dv Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_flv</name>
+      <longname>FFMPEG flv Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG flv Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_mmf</name>
+      <longname>FFMPEG mmf Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG mmf Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_mov</name>
+      <longname>FFMPEG mov Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG mov Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_mp4</name>
+      <longname>FFMPEG mp4 Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG mp4 Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_mpeg</name>
+      <longname>FFMPEG mpeg Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG mpeg Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_mpegts</name>
+      <longname>FFMPEG mpegts Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG mpegts Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
+      <name>ffmux_vob</name>
+      <longname>FFMPEG vob Muxer</longname>
+      <class>Codec/Muxer</class>
+      <description>FFMPEG vob Muxer</description>
+      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
+    </element>
+    <element>
       <name>ffvideoscale</name>
       <longname>FFMPEG Scale element</longname>
       <class>Filter/Converter/Video</class>