Revision 5d43635e 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 mb_cmp = FF_CMP_SAD;
115
static int sub_cmp = FF_CMP_SAD;
116
static int cmp = FF_CMP_SAD;
114 117
static int use_4mv = 0;
115 118
static int use_obmc = 0;
116 119
static int use_aic = 0;
......
1762 1765
    mb_decision = atoi(arg);
1763 1766
}
1764 1767

  
1768
static void opt_mb_cmp(const char *arg)
1769
{
1770
    mb_cmp = atoi(arg);
1771
}
1772

  
1773
static void opt_sub_cmp(const char *arg)
1774
{
1775
    sub_cmp = atoi(arg);
1776
}
1777

  
1778
static void opt_cmp(const char *arg)
1779
{
1780
    cmp = atoi(arg);
1781
}
1782

  
1765 1783
static void opt_qscale(const char *arg)
1766 1784
{
1767 1785
    video_qscale = atof(arg);
......
2271 2289
                    video_enc->flags |= CODEC_FLAG_BITEXACT;
2272 2290

  
2273 2291
                video_enc->mb_decision = mb_decision;
2292
                video_enc->mb_cmp = mb_cmp;
2293
                video_enc->me_sub_cmp = sub_cmp;
2294
                video_enc->me_cmp = cmp;
2274 2295
                
2275 2296
                if (use_umv) {
2276 2297
                    video_enc->flags |= CODEC_FLAG_H263P_UMV;
......
2893 2914
    { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" },
2894 2915
    { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" },
2895 2916
    { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" },
2917
    { "mbcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_cmp}, "macroblock compare function", "cmp function" },
2918
    { "subcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sub_cmp}, "subpel compare function", "cmp function" },
2919
    { "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" },
2896 2920
    { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (MPEG4)" },
2897 2921
    { "obmc", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_obmc}, "use overlapped block motion compensation (h263+)" },
2898 2922
    { "part", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_part}, "use data partitioning (MPEG4)" },

Also available in: Unified diff