From: Aurelien Jacobs <aurel@gnuage.org>
Date: Sun, 21 Jan 2007 22:41:37 +0000 (+0000)
Subject: remove now useless codec_tag setting code in voc muxer
X-Git-Tag: v0.5~10435
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4014fe37a310956902dde0e863863a2c2e47dfc5;p=coroid%2Fffmpeg_saccubus.git

remove now useless codec_tag setting code in voc muxer

Originally committed as revision 7628 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index 590aa4854..6a07c92dd 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 {