comparison riff.c @ 1683:8b062c65fe0d libavformat

remove now useless codec_tag setting code in muxers
author michael
date Sun, 21 Jan 2007 12:44:58 +0000
parents ba58d49d4685
children 67e4f8b8f2df
comparison
equal deleted inserted replaced
1682:1c6ee4cf8a38 1683:8b062c65fe0d
294 { 294 {
295 int bps, blkalign, bytespersec; 295 int bps, blkalign, bytespersec;
296 int hdrsize = 18; 296 int hdrsize = 18;
297 297
298 if(!enc->codec_tag || enc->codec_tag > 0xffff) 298 if(!enc->codec_tag || enc->codec_tag > 0xffff)
299 enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
300 if(!enc->codec_tag || enc->codec_tag > 0xffff)
301 return -1; 299 return -1;
302 300
303 put_le16(pb, enc->codec_tag); 301 put_le16(pb, enc->codec_tag);
304 put_le16(pb, enc->channels); 302 put_le16(pb, enc->channels);
305 put_le32(pb, enc->sample_rate); 303 put_le32(pb, enc->sample_rate);
385 put_le32(pb, enc->height); 383 put_le32(pb, enc->height);
386 put_le16(pb, 1); /* planes */ 384 put_le16(pb, 1); /* planes */
387 385
388 put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */ 386 put_le16(pb, enc->bits_per_sample ? enc->bits_per_sample : 24); /* depth */
389 /* compression type */ 387 /* compression type */
390 put_le32(pb, for_asf ? (enc->codec_tag ? enc->codec_tag : av_codec_get_tag(asf_muxer.codec_tag, enc->codec_id)) : enc->codec_tag); // 388 put_le32(pb, enc->codec_tag);
391 put_le32(pb, enc->width * enc->height * 3); 389 put_le32(pb, enc->width * enc->height * 3);
392 put_le32(pb, 0); 390 put_le32(pb, 0);
393 put_le32(pb, 0); 391 put_le32(pb, 0);
394 put_le32(pb, 0); 392 put_le32(pb, 0);
395 put_le32(pb, 0); 393 put_le32(pb, 0);