virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

remove now useless codec_tag setting code in voc muxer

Browse Source 
Originally committed as revision 7628 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-01-21 22:41:37 +00:00
parent bf60f563aa
commit 4014fe37a3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/vocenc.c
View File

@ -51,28 +51,26 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt)
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
if (!voc->param_written) { if (!voc->param_written) {
int format = codec_get_tag(voc_codec_tags, enc->codec_id); if (enc->codec_tag > 0xFF) {
if (format > 0xFF) {
put_byte(pb, VOC_TYPE_NEW_VOICE_DATA); put_byte(pb, VOC_TYPE_NEW_VOICE_DATA);
put_le24(pb, pkt->size + 12); put_le24(pb, pkt->size + 12);
put_le32(pb, enc->sample_rate); put_le32(pb, enc->sample_rate);
put_byte(pb, enc->bits_per_sample); put_byte(pb, enc->bits_per_sample);
put_byte(pb, enc->channels); put_byte(pb, enc->channels);
put_le16(pb, format); put_le16(pb, enc->codec_tag);
put_le32(pb, 0); put_le32(pb, 0);
} else { } else {
if (s->streams[0]->codec->channels > 1) { if (s->streams[0]->codec->channels > 1) {
put_byte(pb, VOC_TYPE_EXTENDED); put_byte(pb, VOC_TYPE_EXTENDED);
put_le24(pb, 4); put_le24(pb, 4);
put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels)); put_le16(pb, 65536-256000000/(enc->sample_rate*enc->channels));
put_byte(pb, format); put_byte(pb, enc->codec_tag);
put_byte(pb, enc->channels - 1); put_byte(pb, enc->channels - 1);
} }
put_byte(pb, VOC_TYPE_VOICE_DATA); put_byte(pb, VOC_TYPE_VOICE_DATA);
put_le24(pb, pkt->size + 2); put_le24(pb, pkt->size + 2);
put_byte(pb, 256 - 1000000 / enc->sample_rate); put_byte(pb, 256 - 1000000 / enc->sample_rate);
put_byte(pb, format); put_byte(pb, enc->codec_tag);
} }
voc->param_written = 1; voc->param_written = 1;
} else { } else {