# HG changeset patch # User cehoyos # Date 1259797875 0 # Node ID 84cca0a953c506a0d48324c769fb9ad113be2e24 # Parent f164bb900d0b1c6f6c946970d389d60f5c970c4d Revert r20095: Allow compiling to vorbis again. Original patch by Philipp Matthias Hahn, pmhahn pmhahn de diff -r f164bb900d0b -r 84cca0a953c5 vorbis_enc.c --- a/vorbis_enc.c Wed Dec 02 21:25:28 2009 +0000 +++ b/vorbis_enc.c Wed Dec 02 23:51:15 2009 +0000 @@ -530,7 +530,8 @@ // identification header init_put_bits(&pb, p, buffer_len); put_bits(&pb, 8, 1); //magic - ff_put_string(&pb, "vorbis", 0); + for (i = 0; "vorbis"[i]; i++) + put_bits(&pb, 8, "vorbis"[i]); put_bits32(&pb, 0); // version put_bits(&pb, 8, venc->channels); put_bits32(&pb, venc->sample_rate); @@ -549,7 +550,8 @@ // comment header init_put_bits(&pb, p, buffer_len); put_bits(&pb, 8, 3); //magic - ff_put_string(&pb, "vorbis", 0); + for (i = 0; "vorbis"[i]; i++) + put_bits(&pb, 8, "vorbis"[i]); put_bits32(&pb, 0); // vendor length TODO put_bits32(&pb, 0); // amount of comments put_bits(&pb, 1, 1); // framing @@ -562,7 +564,8 @@ // setup header init_put_bits(&pb, p, buffer_len); put_bits(&pb, 8, 5); //magic - ff_put_string(&pb, "vorbis", 0); + for (i = 0; "vorbis"[i]; i++) + put_bits(&pb, 8, "vorbis"[i]); // codebooks put_bits(&pb, 8, venc->ncodebooks - 1);