Skip to content

M
mpd
Commit 4bb84c05 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

vorbis_encoder: removed vorbis_encoder.vc

Allocate the vorbis_comment object when it's used. It is not used anymore in vorbis_encoder_tag().
parent 3333502e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/encoder/vorbis_encoder.c
View file @ 4bb84c05
...@@ -47,7 +47,6 @@ struct vorbis_encoder { ...@@ -47,7 +47,6 @@ struct vorbis_encoder {
vorbis_dsp_state vd; vorbis_dsp_state vd;
vorbis_block vb; vorbis_block vb;
vorbis_info vi; vorbis_info vi;
vorbis_comment vc;
bool flush; bool flush;
}; };
...@@ -177,7 +176,6 @@ vorbis_encoder_reinit(struct vorbis_encoder *encoder, GError **error) ...@@ -177,7 +176,6 @@ vorbis_encoder_reinit(struct vorbis_encoder *encoder, GError **error)
vorbis_analysis_init(&encoder->vd, &encoder->vi); vorbis_analysis_init(&encoder->vd, &encoder->vi);
vorbis_block_init(&encoder->vd, &encoder->vb); vorbis_block_init(&encoder->vd, &encoder->vb);
ogg_stream_init(&encoder->os, g_random_int()); ogg_stream_init(&encoder->os, g_random_int());
vorbis_comment_init(&encoder->vc);
return true; return true;
} }
...@@ -185,14 +183,19 @@ vorbis_encoder_reinit(struct vorbis_encoder *encoder, GError **error) ...@@ -185,14 +183,19 @@ vorbis_encoder_reinit(struct vorbis_encoder *encoder, GError **error)
static void static void
vorbis_encoder_send_header(struct vorbis_encoder *encoder) vorbis_encoder_send_header(struct vorbis_encoder *encoder)
{ {
vorbis_comment vc;
ogg_packet packet, comments, codebooks; ogg_packet packet, comments, codebooks;
vorbis_analysis_headerout(&encoder->vd, &encoder->vc, vorbis_comment_init(&vc);
vorbis_analysis_headerout(&encoder->vd, &vc,
&packet, &comments, &codebooks); &packet, &comments, &codebooks);
ogg_stream_packetin(&encoder->os, &packet); ogg_stream_packetin(&encoder->os, &packet);
ogg_stream_packetin(&encoder->os, &comments); ogg_stream_packetin(&encoder->os, &comments);
ogg_stream_packetin(&encoder->os, &codebooks); ogg_stream_packetin(&encoder->os, &codebooks);
vorbis_comment_clear(&vc);
} }
static bool static bool
...@@ -223,7 +226,6 @@ vorbis_encoder_open(struct encoder *_encoder, ...@@ -223,7 +226,6 @@ vorbis_encoder_open(struct encoder *_encoder,
static void static void
vorbis_encoder_clear(struct vorbis_encoder *encoder) vorbis_encoder_clear(struct vorbis_encoder *encoder)
{ {
vorbis_comment_clear(&encoder->vc);
ogg_stream_clear(&encoder->os); ogg_stream_clear(&encoder->os);
vorbis_block_clear(&encoder->vb); vorbis_block_clear(&encoder->vb);
vorbis_dsp_clear(&encoder->vd); vorbis_dsp_clear(&encoder->vd);
......
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