Revision 90d0379f libavformat/img2.c

View differences:

libavformat/img2.c
232 232
        st->duration = last_index - first_index + 1;
233 233
    }
234 234

  
235
    if(ap->video_codec_id){
235
    if(s1->video_codec_id){
236 236
        st->codec->codec_type = CODEC_TYPE_VIDEO;
237
        st->codec->codec_id = ap->video_codec_id;
238
    }else if(ap->audio_codec_id){
237
        st->codec->codec_id = s1->video_codec_id;
238
    }else if(s1->audio_codec_id){
239 239
        st->codec->codec_type = CODEC_TYPE_AUDIO;
240
        st->codec->codec_id = ap->audio_codec_id;
240
        st->codec->codec_id = s1->audio_codec_id;
241 241
    }else{
242 242
        st->codec->codec_type = CODEC_TYPE_VIDEO;
243 243
        st->codec->codec_id = av_str2id(img_tags, s->path);

Also available in: Unified diff