diff options
| author | Philipp Matthias Hahn <pmhahn@titan.lahn.de> | 2009-12-02 23:51:15 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-02 23:51:15 +0000 |
| commit | 38b5b47b230bb84e3d30b4683db21c396f5df3f5 (patch) | |
| tree | 509479721bafbabb40346727edf8d522b862da47 | |
| parent | ab3faa8bf119b9e8a3b7b30ba4e2d2e857c9df32 (diff) | |
| download | ffmpeg-38b5b47b230bb84e3d30b4683db21c396f5df3f5.tar.gz | |
Revert r20095: Allow compiling to vorbis again.
Original patch by Philipp Matthias Hahn, pmhahn pmhahn de
Originally committed as revision 20711 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vorbis_enc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index 61f78b576f..4e641386c7 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -530,7 +530,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) // 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 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) // 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 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) // 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); |