# HG changeset patch # User alex # Date 1129159515 0 # Node ID aa0abab5e320c8e724ef8bc583d0a2653b2404e5 # Parent 728a867212704165da6fcec41fc410d96d081b8c fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics diff -r 728a86721270 -r aa0abab5e320 ffm.c --- a/ffm.c Wed Oct 12 22:35:06 2005 +0000 +++ b/ffm.c Wed Oct 12 23:25:15 2005 +0000 @@ -132,7 +132,7 @@ ffm->packet_size = FFM_PACKET_SIZE; /* header */ - put_tag(pb, "FFM1"); + put_le32(pb, MKTAG('F', 'F', 'M', '1')); put_be32(pb, ffm->packet_size); /* XXX: store write position in other file ? */ put_be64(pb, ffm->packet_size); /* current write position */ @@ -480,6 +480,7 @@ fst = av_mallocz(sizeof(FFMStream)); if (!fst) goto fail; + s->streams[i] = st; av_set_pts_info(st, 64, 1, 1000000); @@ -487,10 +488,10 @@ codec = st->codec; /* generic info */ - st->codec->codec_id = get_be32(pb); - st->codec->codec_type = get_byte(pb); /* codec_type */ + codec->codec_id = get_be32(pb); + codec->codec_type = get_byte(pb); /* codec_type */ codec->bit_rate = get_be32(pb); - st->quality = get_be32(pb); + st->quality = get_be32(pb); codec->flags = get_be32(pb); codec->flags2 = get_be32(pb); codec->debug = get_be32(pb);