diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-01-21 22:41:37 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-01-21 22:41:37 +0000 |
| commit | 4014fe37a310956902dde0e863863a2c2e47dfc5 (patch) | |
| tree | 150c9cb7bf3e23c1851650ba5baab5c39bfd05fe | |
| parent | bf60f563aadc9bba2e1b82c6ae8cf496131fa831 (diff) | |
| download | ffmpeg-4014fe37a310956902dde0e863863a2c2e47dfc5.tar.gz | |
remove now useless codec_tag setting code in voc muxer
Originally committed as revision 7628 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/vocenc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 590aa4854e..6a07c92dd3 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -51,28 +51,26 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt) ByteIOContext *pb = &s->pb; if (!voc->param_written) { - int format = codec_get_tag(voc_codec_tags, enc->codec_id); - - if (format > 0xFF) { + if (enc->codec_tag > 0xFF) { put_byte(pb, VOC_TYPE_NEW_VOICE_DATA); put_le24(pb, pkt->size + 12); put_le32(pb, enc->sample_rate); put_byte(pb, enc->bits_per_sample); put_byte(pb, enc->channels); - put_le16(pb, format); + put_le16(pb, enc->codec_tag); put_le32(pb, 0); } else { if (s->streams[0]->codec->channels > 1) { put_byte(pb, VOC_TYPE_EXTENDED); put_le24(pb, 4); 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, VOC_TYPE_VOICE_DATA); put_le24(pb, pkt->size + 2); put_byte(pb, 256 - 1000000 / enc->sample_rate); - put_byte(pb, format); + put_byte(pb, enc->codec_tag); } voc->param_written = 1; } else { |