Commit 57832ef3 authored by Laurent Aimar's avatar Laurent Aimar

* all: do not implement DEMUX_SET_TIME. DEMUX_SET_TIME should be

 implemented _only_ when it has a high precision.
parent 6e2ae6f2
...@@ -365,13 +365,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -365,13 +365,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*pi64 = 0; *pi64 = 0;
return VLC_EGENERIC; return VLC_EGENERIC;
case DEMUX_SET_TIME:
#endif #endif
case DEMUX_GET_FPS: case DEMUX_GET_FPS:
pf = (double*)va_arg( args, double * ); pf = (double*)va_arg( args, double * );
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc; *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS; return VLC_SUCCESS;
case DEMUX_SET_TIME:
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* pva.c: PVA demuxer * pva.c: PVA demuxer
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id: pva.c,v 1.1 2004/01/23 17:42:10 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -328,13 +328,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -328,13 +328,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*pi64 = 0; *pi64 = 0;
return VLC_EGENERIC; return VLC_EGENERIC;
case DEMUX_SET_TIME:
#endif #endif
case DEMUX_GET_FPS: case DEMUX_GET_FPS:
pf = (double*)va_arg( args, double * ); pf = (double*)va_arg( args, double * );
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc; *pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS; return VLC_SUCCESS;
#endif #endif
case DEMUX_SET_TIME:
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -693,7 +693,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -693,7 +693,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*pi64 = p_sys->i_time; *pi64 = p_sys->i_time;
return VLC_SUCCESS; return VLC_SUCCESS;
#if 0
case DEMUX_GET_LENGTH: case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * ); pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_mux_rate > 0 ) if( p_sys->i_mux_rate > 0 )
...@@ -703,14 +702,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -703,14 +702,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
} }
*pi64 = 0; *pi64 = 0;
return VLC_EGENERIC; return VLC_EGENERIC;
case DEMUX_SET_TIME:
#endif #endif
case DEMUX_GET_FPS: case DEMUX_GET_FPS:
pf = (double*)va_arg( args, double * ); case DEMUX_SET_TIME:
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS;
#endif
default: default:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
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