Merge svn changes up to r27841

Conflicts:
	mplayer.c

1 files changed, 2 insertions, 0 deletions

diff --git a/command.c b/command.c
index c1559c2d86..6f73e67a84 100644
--- a/command.c
+++ b/command.c
@@ -1958,6 +1958,8 @@ static int mp_property_teletext_page(m_option_t *prop, int action, void *arg,
     tvi_handle_t *tvh = mpctx->demuxer->priv;
     int result;
     int val;
+    if (mpctx->demuxer->type != DEMUXER_TYPE_TV || !tvh)
+        return M_PROPERTY_UNAVAILABLE;
     switch(action){
     case M_PROPERTY_STEP_UP:
     case M_PROPERTY_STEP_DOWN: