Commit 5c638a18 authored by cehoyos's avatar cehoyos

Revert r20095: Allow compiling to vorbis again.

Original patch by Philipp Matthias Hahn, pmhahn pmhahn de 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20711 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4ac5b215
...@@ -530,7 +530,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) ...@@ -530,7 +530,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
// identification header // identification header
init_put_bits(&pb, p, buffer_len); init_put_bits(&pb, p, buffer_len);
put_bits(&pb, 8, 1); //magic 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_bits32(&pb, 0); // version
put_bits(&pb, 8, venc->channels); put_bits(&pb, 8, venc->channels);
put_bits32(&pb, venc->sample_rate); put_bits32(&pb, venc->sample_rate);
...@@ -549,7 +550,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) ...@@ -549,7 +550,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
// comment header // comment header
init_put_bits(&pb, p, buffer_len); init_put_bits(&pb, p, buffer_len);
put_bits(&pb, 8, 3); //magic 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); // vendor length TODO
put_bits32(&pb, 0); // amount of comments put_bits32(&pb, 0); // amount of comments
put_bits(&pb, 1, 1); // framing put_bits(&pb, 1, 1); // framing
...@@ -562,7 +564,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) ...@@ -562,7 +564,8 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
// setup header // setup header
init_put_bits(&pb, p, buffer_len); init_put_bits(&pb, p, buffer_len);
put_bits(&pb, 8, 5); //magic 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 // codebooks
put_bits(&pb, 8, venc->ncodebooks - 1); put_bits(&pb, 8, venc->ncodebooks - 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment