Revision a75e1034 ffmpeg.c

View differences:

ffmpeg.c
3775 3775
                           FFMPEG_DATADIR,
3776 3776
                         };
3777 3777

  
3778
    if (*opt != 'f') {
3778 3779
    for(i=!base[0]; i<2 && !f; i++){
3779 3780
        snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg);
3780 3781
        f= fopen(filename, "r");
......
3786 3787
            f= fopen(filename, "r");
3787 3788
        }
3788 3789
    }
3789
    if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/' ||
3790
              is_dos_path(arg))){
3790
    } else {
3791 3791
        av_strlcpy(filename, arg, sizeof(filename));
3792 3792
        f= fopen(filename, "r");
3793 3793
    }
......
3945 3945
    { "apre", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_preset}, "set the audio options to the indicated preset", "preset" },
3946 3946
    { "vpre", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_preset}, "set the video options to the indicated preset", "preset" },
3947 3947
    { "spre", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_preset}, "set the subtitle options to the indicated preset", "preset" },
3948
    { "fpre", OPT_FUNC2 | HAS_ARG | OPT_EXPERT, {(void*)opt_preset}, "set options to the indicated preset file", "filename" },
3948 3949

  
3949 3950
    { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
3950 3951
    { NULL, },

Also available in: Unified diff