Mercurial > mplayer.hg
comparison mplayer.c @ 13127:957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
| author | mosu |
|---|---|
| date | Tue, 24 Aug 2004 21:20:24 +0000 |
| parents | b59e16a8dfc7 |
| children | cfce549da2f0 |
comparison
equal
deleted
inserted
replaced
| 13126:b59e16a8dfc7 | 13127:957fc21fc10a |
|---|---|
| 3168 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) | 3168 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) |
| 3169 { | 3169 { |
| 3170 int new_id = dvdsub_id + 1; | 3170 int new_id = dvdsub_id + 1; |
| 3171 if (dvdsub_id < 0) | 3171 if (dvdsub_id < 0) |
| 3172 new_id = 0; | 3172 new_id = 0; |
| 3173 if ((unsigned int) new_id >= demux_ogg_num_subs()) | 3173 if ((unsigned int) new_id >= demux_ogg_num_subs(demuxer)) |
| 3174 new_id = -1; | 3174 new_id = -1; |
| 3175 if (new_id != dvdsub_id) | 3175 if (new_id != dvdsub_id) |
| 3176 osd_show_vobsub_changed = sh_video->fps; | 3176 osd_show_vobsub_changed = sh_video->fps; |
| 3177 dvdsub_id = new_id; | 3177 dvdsub_id = new_id; |
| 3178 d_dvdsub->id = demux_ogg_sub_id(new_id); | 3178 d_dvdsub->id = demux_ogg_sub_id(demuxer, new_id); |
| 3179 } | 3179 } |
| 3180 #endif | 3180 #endif |
| 3181 #ifdef HAVE_MATROSKA | 3181 #ifdef HAVE_MATROSKA |
| 3182 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_MATROSKA) { | 3182 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_MATROSKA) { |
| 3183 int new_id = dvdsub_id + 1; | 3183 int new_id = dvdsub_id + 1; |