Revision 0422af7e ffmpeg.c

View differences:

ffmpeg.c
228 228
static int force_fps = 0;
229 229
static char *forced_key_frames = NULL;
230 230

  
231
static int pgmyuv_compatibility_hack=0;
232 231
static float dts_delta_threshold = 10;
233 232

  
234 233
static unsigned int sws_flags = SWS_BICUBIC;
......
2652 2651

  
2653 2652
static void opt_format(const char *arg)
2654 2653
{
2655
    /* compatibility stuff for pgmyuv */
2656
    if (!strcmp(arg, "pgmyuv")) {
2657
        pgmyuv_compatibility_hack=1;
2658
//        opt_image_format(arg);
2659
        arg = "image2";
2660
        fprintf(stderr, "pgmyuv format is deprecated, use image2\n");
2661
    }
2662

  
2663 2654
    last_asked_format = arg;
2664 2655
}
2665 2656

  
......
3046 3037
                          avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->strict_std_compliance);
3047 3038
    ic->flags |= AVFMT_FLAG_NONBLOCK;
3048 3039

  
3049
    if(pgmyuv_compatibility_hack)
3050
        ic->video_codec_id= CODEC_ID_PGMYUV;
3051

  
3052 3040
    /* open the input file with generic libav function */
3053 3041
    err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
3054 3042
    if (err < 0) {

Also available in: Unified diff