diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /command.c | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'command.c')
| -rw-r--r-- | command.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -832,7 +832,7 @@ static int mp_property_audio(m_option_t *prop, int action, void *arg, #ifdef USE_DVDNAV else if (mpctx->stream->type == STREAMTYPE_DVDNAV) - dvdnav_lang_from_aid(mpctx->stream, opts->audio_id, lang); + mp_dvdnav_lang_from_aid(mpctx->stream, opts->audio_id, lang); #endif *(char **) arg = malloc(64); snprintf(*(char **) arg, 64, "(%d) %s", opts->audio_id, lang); @@ -1351,8 +1351,8 @@ static int mp_property_sub(m_option_t *prop, int action, void *arg, if (mpctx->stream->type == STREAMTYPE_DVDNAV) { if (vo_spudec && opts->sub_id >= 0) { unsigned char lang[3]; - if (dvdnav_lang_from_sid(mpctx->stream, opts->sub_id, lang)) { - snprintf(*(char **) arg, 63, "(%d) %s", opts->sub_id, lang); + if (mp_dvdnav_lang_from_sid(mpctx->stream, opts->sub_id, lang)) { + snprintf(*(char **) arg, 63, "(%d) %s", opts->sub_id, lang); return M_PROPERTY_OK; } } |