Revision 72415b2a libavformat/img2.c

View differences:

libavformat/img2.c
233 233
    }
234 234

  
235 235
    if(s1->video_codec_id){
236
        st->codec->codec_type = CODEC_TYPE_VIDEO;
236
        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
237 237
        st->codec->codec_id = s1->video_codec_id;
238 238
    }else if(s1->audio_codec_id){
239
        st->codec->codec_type = CODEC_TYPE_AUDIO;
239
        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
240 240
        st->codec->codec_id = s1->audio_codec_id;
241 241
    }else{
242
        st->codec->codec_type = CODEC_TYPE_VIDEO;
242
        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
243 243
        st->codec->codec_id = av_str2id(img_tags, s->path);
244 244
    }
245
    if(st->codec->codec_type == CODEC_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE)
245
    if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ap->pix_fmt != PIX_FMT_NONE)
246 246
        st->codec->pix_fmt = ap->pix_fmt;
247 247

  
248 248
    return 0;

Also available in: Unified diff