RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 04:45:33 +00:00
Code Issues Releases Wiki Activity
21,811 Commits 41 Branches 86 Tags 134 MiB
e3fe6113a6
Commit Graph

2392 Commits

Author SHA1 Message Date
reimar
e3fe6113a6 sizeof() is long, thus %d format in error message is wrong. 
Fix by assigning extradata_size before and printing that, since
this also removes a bit of code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-05 15:41:00 +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
538674f6b6 set dp->stream_pts only when feeding the video stream to workaround 
strange interleaving patterns in some samples (that show with wild
alternations of the OSD timer going back and forth)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21807 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-01 22:47:14 +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
33ce3088d1 replace call to ds_read_packet() with the usual stream_read()+ds_add_packet() sequence; 
fill demux_packet->stream_pts if the stream layer supports it



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21797 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-31 11:08:27 +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
michael
9eb302dee8 sort 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21795 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-31 10:54:32 +00:00
michael
f89822df44 dont read index if -noidx 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-29 19:01:55 +00:00
michael
8f7f2ad9e0 first step toward amr-nb muxing support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-29 18:56:28 +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
aurel
d1c91ec012 add support for musepack native decoder from ffmpeg (require -demuxer lavf) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-28 00:40:49 +00:00
ods15
7c44ff0483 Sync to libnut, nom->num 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21739 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-23 12:34:31 +00:00
uau
29a0a85b48 Fix display of multiple simultaneous subtitles without libass. 
Was broken in r19649.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-21 22:11:47 +00:00
nicodvb
cf099b2100 muxers now write to output muxer->stream rather than to muxer->file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-18 21:03:59 +00:00
reimar
7ac56b70b8 doxify a comment 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21667 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-18 15:15:21 +00:00
reimar
9526342555 Require 12 consecutive MPEG-audio headers before detecting as audio. 
Fixes misdetection of http://samples.mplayerhq.hu/FLV/flv_misdetected_as_mpa


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21666 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-18 15:14:23 +00:00
reimar
370c07962b ASF aspect support via metadata reading. 
Patch by Zuxy Meng (zuxy meng (at) gmail.com) with some
simplifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21626 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-15 21:51:20 +00:00
eugeni
8d4098a160 VobSub tracks cannot be handled by libass, do not mark them with 'a'. 
This fixes the bug with VobSub not being displayed with -ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-15 19:35:06 +00:00
reimar
b9e8186ac3 Respect -noidx in lavf demuxer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-10 21:37:00 +00:00
uau
2cfcfc4f22 Set AVFMT_FLAG_GENPTS if -correct-pts is used. 
This should allow using -correct-pts (and thus filters which adjust pts
or add frames) with dvd or other mpeg container files by specifying
"-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2
decoder too but certainly not with internal demuxer.
Using this flag isn't quite optimal as it can cause extra buffering of
demuxed frames, but at least it's better than just failing until a more
complex solution is implemented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-10 00:50:38 +00:00
nicodvb
3e7616ecab align vbuf_size to the max value allowed by main profile @ high level 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-09 22:21:37 +00:00
reimar
77226f96ba Replace another MIN macro by FFMIN 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-09 12:25:25 +00:00
reimar
6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here. 
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-09 12:24:11 +00:00
reimar
83916cab7f Remove condition that should always be true 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-09 11:59:49 +00:00
reimar
a8bf24702b Fix crash in ogg demuxer uninit with -aid 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-09 11:59:09 +00:00
nicodvb
4a5164d995 made vorbis_info a member of ogg_stream rather than ogg_demuxer; 
this change paves the way for multi audio track support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 20:53:05 +00:00
reimar
28564d6355 vorbis_comment is only used locally, move it out of demuxer struct 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 12:02:51 +00:00
reimar
6fb4b1b30a Remove unused ov_struct_t 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 12:02:01 +00:00
reimar
18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 11:58:07 +00:00
reimar
a4147be5f7 Fix memleaks caused by missing vorbis/theora_info/comment_clear calls. 
Code still seems wrong to me for multiple audio tracks, since there is
only one vorbis comment/info entry for the demuxer, not one per track?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-06 10:46:50 +00:00
nicodvb
e704821b75 disable telecining when it can't be applied 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 22:08:11 +00:00
nicodvb
a176dc29b9 since display_frames in increased by a possibly negative number it had better be signed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 21:58:07 +00:00
nicodvb
9e365b6032 cosmetics 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 21:27:05 +00:00
nicodvb
7057e42777 removed dead code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 21:24:39 +00:00
nicodvb
8ec5a6a3ca reimplemented :telecine and :film2pal in terms of dgpulldown 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 21:20:01 +00:00
nicodvb
858813f36f pre-store in bff_mask the correct or-mask to be saved in the pce (slightly faster) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 20:38:46 +00:00
nicodvb
6dc68e8680 10l: wrong bitmask when patching the pce_ptr in soft_telecine() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 00:52:11 +00:00
nicodvb
2fded9964f added generalized teleciner by Donald Graft 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-04 00:02:15 +00:00
eugeni
b5a682f0aa Rename: ass_process_font -> ass_add_font. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 17:35:40 +00:00
reimar
0639d41ffc Use libavutil LE_* macros instead of pointer casts which can result 
in crashes due to missing alignment. Should fix bug #640.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21470 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 16:41:55 +00:00
nicodvb
6d8213c5d6 cosmetics: anti-chaos reindentation 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 12:06:08 +00:00
reimar
4a6ad7c674 Unicode support for demuxer info in ASF demuxer. 
Patch by Zuxy Meng [zuxy meng <at> gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21461 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-03 11:35:11 +00:00
diego
9c2d44923a Remove superfluous bswap.h include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-02 12:32:44 +00:00
diego
c00059b047 Remove suffix rules that are just copies of make builtin rules. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-02 12:08:25 +00:00
diego
44e2adf8d3 Use standard name for C++ flags. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-02 11:41:58 +00:00
nicodvb
b5ecb3ba07 permit to specify the sizes of the decoders' buffers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-01 23:51:51 +00:00
reimar
24f3a0132c 100l confused FFMIN/FFMAX 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-01 19:43:36 +00:00
reimar
0af2daec29 Proper fix for last demux_avi commit, stream switching now really should 
not hang anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-01 19:24:42 +00:00
reimar
f32179337e Make sure we do not hang if no streams are available 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-01 18:51:44 +00:00