aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-30 10:37:37 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-30 10:37:37 +0000
commiteb0d04c325a6c2bb46a627f247fe1c73d5a80506 (patch)
tree462edecaadd20e012af85b9bd782a6b7e7048520
parent003121091e27ccf1bca4480c83ef13957027ed95 (diff)
downloadffmpeg-eb0d04c325a6c2bb46a627f247fe1c73d5a80506.tar.gz
Use ff_put_string in vorbis encoder.
Originally committed as revision 20095 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vorbis_enc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index dc3cdbf1c6..68cd41822e 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -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);