Browse Source

Use ff_put_string in vorbis encoder.

Originally committed as revision 20095 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Reimar Döffinger 15 years ago
parent
commit
eb0d04c325
1 changed files with 3 additions and 6 deletions
  1. +3
    -6
      libavcodec/vorbis_enc.c

+ 3
- 6
libavcodec/vorbis_enc.c View File

@@ -530,8 +530,7 @@ 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
for (i = 0; "vorbis"[i]; i++)
put_bits(&pb, 8, "vorbis"[i]);
ff_put_string(&pb, "vorbis", 0);
put_bits(&pb, 32, 0); // version
put_bits(&pb, 8, venc->channels);
put_bits(&pb, 32, venc->sample_rate);
@@ -550,8 +549,7 @@ 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
for (i = 0; "vorbis"[i]; i++)
put_bits(&pb, 8, "vorbis"[i]);
ff_put_string(&pb, "vorbis", 0);
put_bits(&pb, 32, 0); // vendor length TODO
put_bits(&pb, 32, 0); // amount of comments
put_bits(&pb, 1, 1); // framing
@@ -564,8 +562,7 @@ 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
for (i = 0; "vorbis"[i]; i++)
put_bits(&pb, 8, "vorbis"[i]);
ff_put_string(&pb, "vorbis", 0);

// codebooks
put_bits(&pb, 8, venc->ncodebooks - 1);


Loading…
Cancel
Save