Revision 622348f9 ffmpeg.c

View differences:

ffmpeg.c
111 111
static int same_quality = 0;
112 112
static int b_frames = 0;
113 113
static int mb_decision = FF_MB_DECISION_SIMPLE;
114
static int ildct_cmp = FF_CMP_VSAD;
114 115
static int mb_cmp = FF_CMP_SAD;
115 116
static int sub_cmp = FF_CMP_SAD;
116 117
static int cmp = FF_CMP_SAD;
......
1639 1640

  
1640 1641
static void opt_video_buffer_size(const char *arg)
1641 1642
{
1642
    video_rc_buffer_size = atoi(arg) * 1024;
1643
    video_rc_buffer_size = atoi(arg) * 8*1024;
1643 1644
}
1644 1645

  
1645 1646
static void opt_video_rc_eq(char *arg)
......
1841 1842
    mb_cmp = atoi(arg);
1842 1843
}
1843 1844

  
1845
static void opt_ildct_cmp(const char *arg)
1846
{
1847
    ildct_cmp = atoi(arg);
1848
}
1849

  
1844 1850
static void opt_sub_cmp(const char *arg)
1845 1851
{
1846 1852
    sub_cmp = atoi(arg);
......
2372 2378

  
2373 2379
                video_enc->mb_decision = mb_decision;
2374 2380
                video_enc->mb_cmp = mb_cmp;
2381
                video_enc->ildct_cmp = ildct_cmp;
2375 2382
                video_enc->me_sub_cmp = sub_cmp;
2376 2383
                video_enc->me_cmp = cmp;
2377 2384
                
......
3000 3007
    { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
3001 3008
    { "maxrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_max}, "set max video bitrate tolerance (in kbit/s)", "bitrate" },
3002 3009
    { "minrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" },
3003
    { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" },
3010
    { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kByte)", "size" },
3004 3011
    { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
3005 3012
    { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", 
3006 3013
      "method" },
......
3012 3019
    { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" },
3013 3020
    { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" },
3014 3021
    { "mbcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_cmp}, "macroblock compare function", "cmp function" },
3022
    { "ildctcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ildct_cmp}, "ildct compare function", "cmp function" },
3015 3023
    { "subcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sub_cmp}, "subpel compare function", "cmp function" },
3016 3024
    { "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" },
3017 3025
    { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (MPEG4)" },

Also available in: Unified diff