Commit 1eae38c6 authored by oggk's avatar oggk
Browse files

disable more code when HAVE_KATE is not defined - this avoids using some

 data which wasn't initialized when the init code was compiled out.

parent e8f1073d
......@@ -783,6 +783,7 @@ void ff2theora_output(ff2theora this) {
for (i = 0; i < this->context->nb_streams; i++) {
subtitles_enabled[i] = 0;
subtitles_opened[i] = 0;
#ifdef HAVE_KATE
if (!this->disable_subtitles) {
AVStream *stream = this->context->streams[i];
AVCodecContext *enc = stream->codec;
......@@ -800,8 +801,10 @@ void ff2theora_output(ff2theora this) {
}
}
}
#endif
}
#ifdef HAVE_KATE
for (i=0; i<this->n_kate_streams; ++i) {
ff2theora_kate_stream *ks=this->kate_streams+i;
if (ks->stream_index >= 0) {
......@@ -829,6 +832,7 @@ void ff2theora_output(ff2theora this) {
}
}
}
#endif
oggmux_setup_kate_streams(&info, this->n_kate_streams);
......
......@@ -452,6 +452,7 @@ void oggmux_init (oggmux_info *info) {
fwrite (og.header, 1, og.header_len,info->outfile);
fwrite (og.body, 1, og.body_len, info->outfile);
}
#ifdef HAVE_KATE
if (info->with_kate) {
int n;
for (n=0; n<info->n_kate_streams; ++n) {
......@@ -470,6 +471,7 @@ void oggmux_init (oggmux_info *info) {
}
}
}
#endif
if (info->with_skeleton) {
int result;
......
Supports Markdown
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