comparison utils.c @ 2832:8ac5fe1c5549 libavformat

Allow overriding codec_ids.

2831:e89500ae1608

/*******************************************************/

int av_read_packet(AVFormatContext *s, AVPacket *pkt)
{
    av_init_packet(pkt);
    return s->iformat->read_packet(s, pkt);
}

/**********************************************************/

/**

2832:8ac5fe1c5549

/*******************************************************/

int av_read_packet(AVFormatContext *s, AVPacket *pkt)
{
    int ret;
    AVStream *st;
    av_init_packet(pkt);
    ret= s->iformat->read_packet(s, pkt);
    st= s->streams[pkt->stream_index];

    switch(st->codec->codec_type){
    case CODEC_TYPE_VIDEO:
        if(s->video_codec_id)   st->codec->codec_id= s->video_codec_id;
        break;
    case CODEC_TYPE_AUDIO:
        if(s->audio_codec_id)   st->codec->codec_id= s->audio_codec_id;
        break;
    case CODEC_TYPE_SUBTITLE:
        if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id;
        break;
    }

    return ret;
}

/**********************************************************/

/**