Revision ecc544de ffmpeg.c

View differences:

ffmpeg.c
2882 2882
   // ap->sample_fmt = audio_sample_fmt; //FIXME:not implemented in libavformat
2883 2883
    ap->channel = video_channel;
2884 2884
    ap->standard = video_standard;
2885
    ap->video_codec_id = find_codec_or_die(video_codec_name, CODEC_TYPE_VIDEO, 0);
2886
    ap->audio_codec_id = find_codec_or_die(audio_codec_name, CODEC_TYPE_AUDIO, 0);
2887
    if(pgmyuv_compatibility_hack)
2888
        ap->video_codec_id= CODEC_ID_PGMYUV;
2889 2885

  
2890 2886
    set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM);
2891 2887

  
......
2894 2890
    ic->subtitle_codec_id= find_codec_or_die(subtitle_codec_name, CODEC_TYPE_SUBTITLE, 0);
2895 2891
    ic->flags |= AVFMT_FLAG_NONBLOCK;
2896 2892

  
2893
    if(pgmyuv_compatibility_hack)
2894
        ic->video_codec_id= CODEC_ID_PGMYUV;
2895

  
2897 2896
    /* open the input file with generic libav function */
2898 2897
    err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
2899 2898
    if (err < 0) {

Also available in: Unified diff