diff options
| author | wm4 <wm4@nowhere> | 2013-04-15 21:27:38 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-20 23:28:27 +0200 |
| commit | 15ff7a57198beb675e379b0453561e5bc90e8859 (patch) | |
| tree | 3717ec8b72aa3d6938c489355b387255b07dfaa0 /demux | |
| parent | c12b5ffc33f8fb424b821afef1e060d7f6275844 (diff) | |
| download | mpv-15ff7a57198beb675e379b0453561e5bc90e8859.tar.bz2 mpv-15ff7a57198beb675e379b0453561e5bc90e8859.tar.xz | |
demux: remove some unused sh_video_t fields
Completely mysterious, and its values were never actually used.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_avi.c | 3 | ||||
| -rw-r--r-- | demux/stheader.h | 4 | ||||
| -rw-r--r-- | demux/video.c | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/demux/demux_avi.c b/demux/demux_avi.c index fbce13f707..daf542bfac 100644 --- a/demux/demux_avi.c +++ b/demux/demux_avi.c @@ -652,8 +652,7 @@ static void demux_seek_avi(demuxer_t *demuxer, float rel_seek_secs, int id=((AVIINDEXENTRY *)priv->idx)[i].ckid; if(avi_stream_id(id)==d_video->id) ++d_video->pack_no; } - priv->video_pack_no= - sh_video->num_frames=sh_video->num_frames_decoded=d_video->pack_no; + priv->video_pack_no=d_video->pack_no; priv->avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; d_video->pos=video_chunk_pos; diff --git a/demux/stheader.h b/demux/stheader.h index 7cb65b9bcc..af4ceaff16 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -127,10 +127,6 @@ typedef struct sh_audio { typedef struct sh_video { SH_COMMON - float timer; // absolute time in video stream, since last start/seek - // frame counters: - float num_frames; // number of frames played - int num_frames_decoded; // number of frames decoded double i_pts; // PTS for the _next_ I/P frame (internal mpeg demuxing) float next_frame_time; double last_pts; diff --git a/demux/video.c b/demux/video.c index d565687d8b..69749e03d1 100644 --- a/demux/video.c +++ b/demux/video.c @@ -560,10 +560,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** //------------------------ frame decoded. -------------------- - // Increase video timers: - sh_video->num_frames+=frame_time; - ++sh_video->num_frames_decoded; - frame_time*=sh_video->frametime; // override frame_time for variable/unknown FPS formats: |