diff options
| author | wm4 <wm4@nowhere> | 2012-08-18 11:13:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:02 +0200 |
| commit | 8ca3ec1562986c0681261cad407e05578eda45fd (patch) | |
| tree | 0822a5c95e2b0e26ec9497e6826a98db8704dfa2 /libmpdemux/video.c | |
| parent | fc2ea37694a6e508fe6ebc56711b11be592c7a8d (diff) | |
| download | mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.bz2 mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.xz | |
libmpdemux: remove demux_real, demux_viv, demux_audio
libavformat replaces demux_audio completely. I don't know/care what
vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works
slightly better, with a different set of bugs.
Diffstat (limited to 'libmpdemux/video.c')
| -rw-r--r-- | libmpdemux/video.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 27e924f883..9045da1147 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -86,8 +86,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) frame_time=d_video->pts-pts1; break; - case DEMUXER_TYPE_TV: - case DEMUXER_TYPE_VIVO: case DEMUXER_TYPE_ASF: { double next_pts = ds_get_next_pts(d_video); double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1; @@ -115,14 +113,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** } } break; - case DEMUXER_TYPE_REAL: - { - double next_pts = ds_get_next_pts(d_video); - double d = (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts - pts1; - - frame_time = (d >= 0 && pts1 > 0) ? d : 0.001; - } - break; } |