RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
25,266 Commits 41 Branches 85 Tags 134 MiB
Commit Graph

239 Commits

Author SHA1 Message Date
reimar a47c3bec6d Fix typos in comments to stop them hurting my eyes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 13:35:25 +00:00
uau 1f5bb6386e demuxer.c: Remove useless code 
Remove "while(1) { }" around two instances of code that always do
"return" in the loop body. No functionality changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-25 19:21:24 +00:00
uau 1c5d870414 Fix missing subtitles after seeking back 
Subtitle packets that had been demuxed but whose start time had not
yet been reached were left in the demuxer stream after seeking.
When using the default (non-libass) subtitle rendering this could
block subtitles from appearing as long as the playback position stayed
below the original one before seek. External subtitle files were not
affected.

Fixed by making seek code free all packets from the subtitle stream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-04 02:35:34 +00:00
lu_zero 0ff4b3fd9f libnemesi support, yet another rtsp/rtp library... 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-19 21:38:22 +00:00
diego 01d92a32ad cosmetics: typo fix UNSUPORTED --> UNSUPPORTED 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-28 22:38:45 +00:00
reimar 185bc3320f When a new subtitle stream becomes available check if it is the one that 
was requested by the user and set up sub->id and sub->sh accordingly.
Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback
could make them show). This was broken by r23786.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-09 10:26:00 +00:00
reimar 5bd192c77d Make sure fformat is set before use 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-27 20:25:43 +00:00
reimar 958fc672cb Remove some unneeded extern variable declarations 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-27 20:22:55 +00:00
reimar f36073916f make opt argument of demux_info_get const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-24 10:20:42 +00:00
reimar 74047be59a Fix memleak due to not freeing demuxer->s_streams 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-23 17:39:27 +00:00
zuxy 276394a205 More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH control 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-17 13:28:52 +00:00
reimar 6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow 
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-05 14:27:54 +00:00
diego 05c7a055e8 Simplify preprocessor directives: There is a general variable for 
static/shared FFmpeg libraries now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-26 15:10:07 +00:00
reimar b5aa994f1c Cosmetics: remove duplicate space in ifdef 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23090 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-22 20:59:14 +00:00
nicodvb effc6dcf23 demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23087 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-22 20:32:15 +00:00
reimar ef91f5aad8 Add lavf_preferred demuxer for lavf formats we want to be probed 
before our native demuxers and remove some now unneeded file-extension
hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-14 10:03:42 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 18:36:36 +00:00
uau c60af33716 Move the sh_audio->delay field to mpctx->delay. 
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-11 06:16:14 +00:00
rathann 45defa1aa0 Fix a few gcc warnings, approved by Diego and Reimar. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-05 23:46:08 +00:00
reimar 9e1add871e Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error, 
-1 could be a perfectly valid pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-05 15:24:38 +00:00
nicodvb 55303b223e removed unused variable 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-31 17:24:14 +00:00
nicodvb 8558d03eb9 use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-31 11:09:53 +00:00
nicodvb b5898c2aa6 added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-31 11:05:26 +00:00
aurel 016b1cb9e5 don't compile demux_mpc.c when libmpcdec is disabled 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-28 23:44:38 +00:00
nicodvb 96e829fc9c added code to switch video stream 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-16 21:23:06 +00:00
reimar c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-13 16:15:23 +00:00
nicodvb 6e28f63e36 consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-12 17:19:56 +00:00
nicodvb c42fa438f4 removed duplicated check in demuxer_seek_chapter 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-11 13:57:09 +00:00
nicodvb 5c361eff9d in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20855 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-11 11:53:32 +00:00
nicodvb 6200940dcb added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-07 22:55:49 +00:00
nicodvb 0fa1a3e4c6 now demux_seek() tries to seek aided by the stream layer, if possible 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-07 22:54:28 +00:00
reimar 2b13b3a6c8 Cosmetics: indentation fix indentation broken by last two demuxer.c commits 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-20 19:36:59 +00:00
reimar d42038edb9 Fix opening of demuxers without check_file function, broken by r20309. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-20 19:31:52 +00:00
reimar d4d22f49e9 Try other demuxers if open() fails. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-19 18:20:12 +00:00
reimar fa92a6aad5 Simplify: replace malloc + memset 0 by calloc 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-05 21:31:21 +00:00
ods15 2f07a40d8d conditional declerations are unnecessary 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-17 10:22:23 +00:00
ods15 1b8971d82e Add demux_nut to MPlayer repo 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-17 09:32:28 +00:00
reimar ccf75d6711 Get rid of demux_aid_vid_mismatch mess. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-26 19:17:04 +00:00
nicodvb b38ff54517 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19485 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-21 19:52:11 +00:00
nicodvb b7b319395e demuxer_seek_chapter() returns informations about chapters count and name 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-21 19:19:00 +00:00
nicodvb 1870190d37 clarification in a comment 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-18 19:03:59 +00:00
nicodvb e8870c3db7 support relative seeking in the stream-driven case 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19444 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-18 19:03:31 +00:00
nicodvb 01602c31b3 added first revision of demuxer_seek_chapter() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-18 16:48:22 +00:00
reimar 85d85da0f2 Update information and print new value when demux_info_add is called 
twice for the same tag.
Should show currently playing title with Ogg streams.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19419 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-16 23:32:39 +00:00
eugeni 1de0c3327d Add matroska chapter seeking capability. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-06 18:55:34 +00:00
reynaldo 1a16cbfec3 marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-13 05:03:43 +00:00
uau e2727ec797 Add a new video pts tracking mode, enabled by option -correct-pts. 
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
  demuxers.
- Video filters can modify frame timestamps and insert new frames, and
  removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.

Things should work as before when the -correct-pts option is not used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-06 06:58:17 +00:00
reimar 58237ff084 move some ill-behaving demuxers further down the list 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18905 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-04 21:26:41 +00:00
uau 7022f65d0c Change free_sh_audio() to take demuxer and stream id as parameters 
(same as new_sh_audio()) instead of sh_audio_t *, use those to remove
the pointer from demuxer->a_streams[] before freeing it.

Some demuxers use free_sh_audio() to undo the creation of an
already-allocated audio stream in case of error. These uses were unsafe
since free_sh_audio() freed the data structure but left the pointer in
demuxer->a_streams[], leading to double free later in free_demuxer()
(and perhaps use of the freed stream before that, I didn't check).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-14 14:05:59 +00:00
diego bc30e8e673 Unconditionally compile the Matroska demuxer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-08 21:41:15 +00:00