comparison ffm.c @ 862:aa0abab5e320 libavformat

fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics
author alex
date Wed, 12 Oct 2005 23:25:15 +0000
parents 66cc656ea404
children da1d5db0ce5c
comparison
equal deleted inserted replaced
861:728a86721270 862:aa0abab5e320
130 int bit_rate, i; 130 int bit_rate, i;
131 131
132 ffm->packet_size = FFM_PACKET_SIZE; 132 ffm->packet_size = FFM_PACKET_SIZE;
133 133
134 /* header */ 134 /* header */
135 put_tag(pb, "FFM1"); 135 put_le32(pb, MKTAG('F', 'F', 'M', '1'));
136 put_be32(pb, ffm->packet_size); 136 put_be32(pb, ffm->packet_size);
137 /* XXX: store write position in other file ? */ 137 /* XXX: store write position in other file ? */
138 put_be64(pb, ffm->packet_size); /* current write position */ 138 put_be64(pb, ffm->packet_size); /* current write position */
139 139
140 put_be32(pb, s->nb_streams); 140 put_be32(pb, s->nb_streams);
478 if (!st) 478 if (!st)
479 goto fail; 479 goto fail;
480 fst = av_mallocz(sizeof(FFMStream)); 480 fst = av_mallocz(sizeof(FFMStream));
481 if (!fst) 481 if (!fst)
482 goto fail; 482 goto fail;
483 s->streams[i] = st;
483 484
484 av_set_pts_info(st, 64, 1, 1000000); 485 av_set_pts_info(st, 64, 1, 1000000);
485 486
486 st->priv_data = fst; 487 st->priv_data = fst;
487 488
488 codec = st->codec; 489 codec = st->codec;
489 /* generic info */ 490 /* generic info */
490 st->codec->codec_id = get_be32(pb); 491 codec->codec_id = get_be32(pb);
491 st->codec->codec_type = get_byte(pb); /* codec_type */ 492 codec->codec_type = get_byte(pb); /* codec_type */
492 codec->bit_rate = get_be32(pb); 493 codec->bit_rate = get_be32(pb);
493 st->quality = get_be32(pb); 494 st->quality = get_be32(pb);
494 codec->flags = get_be32(pb); 495 codec->flags = get_be32(pb);
495 codec->flags2 = get_be32(pb); 496 codec->flags2 = get_be32(pb);
496 codec->debug = get_be32(pb); 497 codec->debug = get_be32(pb);
497 /* specific info */ 498 /* specific info */
498 switch(codec->codec_type) { 499 switch(codec->codec_type) {