comparison rmdec.c @ 2719:6469205c08e4 libavformat

Change ff_rm_read_mdpr_codecdata to get back to old behavior.

2718:1bbb4fa1cdcd

static int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
{
    ByteIOContext *pb = &s->pb;
    unsigned int v;
    int codec_data_size, size, res = -1;
    int64_t codec_pos;

    codec_data_size = get_be32(pb);
    codec_pos = url_ftell(pb);
    v = get_be32(pb);

        case 4: st->codec->codec_id = CODEC_ID_RV40; break;
        default: goto fail1;
        }
    }

    res = 0;
skip:
    /* skip codec info */
    size = url_ftell(pb) - codec_pos;
    url_fskip(pb, codec_data_size - size);

    return res;
}


static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
{

2719:6469205c08e4

static int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
{
    ByteIOContext *pb = &s->pb;
    unsigned int v;
    int codec_data_size, size;
    int64_t codec_pos;

    codec_data_size = get_be32(pb);
    codec_pos = url_ftell(pb);
    v = get_be32(pb);

        case 4: st->codec->codec_id = CODEC_ID_RV40; break;
        default: goto fail1;
        }
    }

skip:
    /* skip codec info */
    size = url_ftell(pb) - codec_pos;
    url_fskip(pb, codec_data_size - size);

    return 0;
}


static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
{