diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2005-10-12 23:25:15 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2005-10-12 23:25:15 +0000 |
| commit | 26aa0f8956f576e86c22928857c0e18784c521e2 (patch) | |
| tree | f5615655bc7bd294406712cbbfbf237585878dc9 /libavformat | |
| parent | e134e10f3788fa2c5d271430a5e308730d1db7fd (diff) | |
fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics
Originally committed as revision 4636 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/ffm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/ffm.c b/libavformat/ffm.c index 730ba02398..775a89c0c2 100644 --- a/libavformat/ffm.c +++ b/libavformat/ffm.c @@ -132,7 +132,7 @@ static int ffm_write_header(AVFormatContext *s) 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 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) 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); |