Skip to content

V
vlc
Commit 1035469c authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

mpga demux: DEMUX_SET_TIME was using DEMUX_GET_LENGTH logic unintentionally.

parent 8be4ff02
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/demux/mpeg/mpga.c
View file @ 1035469c
...@@ -356,10 +356,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -356,10 +356,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*pi64 = p_sys->i_pts + p_sys->i_time_offset; *pi64 = p_sys->i_pts + p_sys->i_time_offset;
return VLC_SUCCESS; return VLC_SUCCESS;
case DEMUX_SET_TIME:
/* FIXME TODO: implement a high precision seek (with mp3 parsing)
* needed for multi-input */
case DEMUX_GET_LENGTH: case DEMUX_GET_LENGTH:
i_ret = demux_vaControlHelper( p_demux->s, 0, -1, i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
p_sys->i_bitrate_avg, 1, i_query, p_sys->i_bitrate_avg, 1, i_query,
...@@ -383,6 +379,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -383,6 +379,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
va_end( args_save ); va_end( args_save );
return i_ret; return i_ret;
case DEMUX_SET_TIME:
/* FIXME TODO: implement a high precision seek (with mp3 parsing)
* needed for multi-input */
default: default:
i_ret = demux_vaControlHelper( p_demux->s, 0, -1, i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
p_sys->i_bitrate_avg, 1, i_query, p_sys->i_bitrate_avg, 1, i_query,
......
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