RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
23,609 Commits 41 Branches 86 Tags 147 MiB
Commit Graph

2649 Commits

Author SHA1 Message Date
reimar b88ce7fe9d pstrcpy -> av_strlcpy 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23622 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-24 08:39:40 +00:00
reimar 65d087b955 Remove the now unused demux_mkv_change_subs function 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23620 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-24 08:12:08 +00:00
reimar 27bf5698d1 Set demuxer->sub->sh to one of the s_streams like done for audio and video. 
This makes the code simpler and more like the other demuxers,
allowing to remove some special cases in mplayer.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23618 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-24 07:29:03 +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
reimar 5318221f0a 100l, last demux_mkv patch passed ints instead of pointers to them to sscanf 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23611 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-23 16:57:27 +00:00
reimar dc0e2a9a46 Use sh_sub_t instead of mkv_track_t argument where possible, simplifying the code a bit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23610 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-23 15:38:00 +00:00
uau 9a6313ed24 demux_mkv very long seek fix 
The seek code searching for the closest position in the index used
"int64_t min_diff=0xFFFFFFFL" as the initial "further from the goal
than any real alternative" value. The unit is milliseconds so seeks more
than about 75 hours past the end of the file would fail to recognize the
last index position as the best match. This was triggered in practice by
chapter seek code which apparently uses a seek of 1000000000 seconds
forward to mean "seek to the end". The practical effect was that trying
to seek to the next chapter in a file without chapters made MPlayer
block until it finished reading the file from the current position to
the end.

Fixed by increasing the initial value from FFFFFFF to FFFFFFFFFFFFFFF.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23592 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-20 18:19:03 +00:00
uau 4c1b6e248a Fix demuxer.h multiple inclusion guard 
The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file.
Move the #endif to the last line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-20 16:52:32 +00:00
reimar 8eeb449d58 Remove useless demnuxer.h include from matroska.h, it creats "hundreds" of 
"warning: redundant redeclaration"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23590 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-20 16:29:56 +00:00
cehoyos 634dfcbed7 Simplify network timeout calculation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23589 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-20 10:39:57 +00:00
cehoyos 5763ed69ac Silence three warnings. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23575 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-18 09:15:32 +00:00
cehoyos ed522600d8 Stop playing at eof or if no data arrives for ten seconds. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23574 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-18 08:53:53 +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 2c1ee29835 Set subtitle type in mpg demuxer. Fixes subtitle switching with 'j' 
(previously subtitles would just disappear).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23570 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-17 10:24:10 +00:00
nicodvb e2ed3cb72d clearly specify the valid substream id range, rather than using unreadable bitmasks (it also prevents misdetection 0xFF as valid) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23550 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-12 22:08:30 +00:00
aurel 08e5dd0793 Don't set random codec parameters for AC3/DTS in mkv. 
Those values are not needed anyway.
This fixes stream copying from mkv with mencoder.
Patch by Trent Piepho.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23534 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-10 16:45:30 +00:00
nicodvb 6099913ed0 removed functions that were used to parse mpeg12 video (no more video); patch by John Donaghy 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23531 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-10 09:25:09 +00:00
nicodvb 990b33b1c2 init ts_probe to 0 and probe up to TS_MAX_PROBE_SIZE if the parameter 
is not explicitly set by the user;
make the code that checks audio-only stream files respect -tsprobe 



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23529 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-09 18:20:21 +00:00
nicodvb 90a8abd89c added support for DTS1 audio descriptor 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23527 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-09 11:57:22 +00:00
nicodvb 3c4127353a 1000000l, descriptor VC-1 identifies VIDEO_VC1, not AUDIO_DTS 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23526 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-09 11:56:10 +00:00
eugeni aa79f008cd Fix segfault when encoding from an mkv file with embedded fonts. 
Patch by Dominique Dumont (domi dumont at free fr).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23502 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-07 22:45:41 +00:00
uau 2d06dc3ce7 Calculate pts with double precision in demux_asf 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23489 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-07 09:17:10 +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
zuxy 20b298056a Use 'static inline' instead of 'inline static' to avoid warnings 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23461 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-04 09:39:55 +00:00
zuxy d36bb9b201 Remove unused parameter for mp_msg 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23458 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-03 08:48:44 +00:00
zuxy 991ff1be27 Make realloc_struct inline as other functions defined in demuxer.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23451 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-02 16:04:56 +00:00
nicodvb 5fe0ff0e1b prog_id is an uint16_t; reported by Mario Rossi (mariofurire googlemail com) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-02 10:26:37 +00:00
zuxy 6a5b9c26d0 Use play duration instead of send duration to calculate the length 
of an ASF clip.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23417 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-30 08:36:38 +00:00
reimar d4fbb004a6 Get rid of __attribute__((__packed__)) in Matroska demuxer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23404 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-28 18:13:33 +00:00
cehoyos 7a640111d4 10l: r23399 broke mov/mp4 demuxing 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-28 14:25:48 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-28 08:42:35 +00:00
zuxy e5113fdfec Set i_bps for ASF video streams according to extended stream properties 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23375 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-22 13:55:14 +00:00
corey f7c7e60349 cosmetics: fix indentation for previous commit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23339 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-18 02:10:41 +00:00
corey d26e1dd55f PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, ctx->pix_fmt gets 
set incorrectly to PIX_FMT_YUV420P


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-18 02:09:26 +00:00
reimar f060263337 Reuse AV_RL macros in ogg demuxer instead of its own overcomplicated implementations of it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23330 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 13:07:15 +00:00
reimar ea59198921 Make use of new AV_RL64 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23329 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 12:56:08 +00:00
reimar e576e08661 Remove useless setting of dp->len, it is already set to that value by 
new_demux_packet


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23328 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 10:05:00 +00:00
corey f58a3d0fda Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 00:16:51 +00:00
corey 26e13fe9af Add imgfmt (AKA pixel format) to muxer_stream_t so that encoders can 
pass imgfmt to muxers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23326 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 00:15:08 +00:00
uau de444acf51 Fix double free() in demux_asf.c 
If demux_open_asf() fails it frees the demuxer->priv field before
returning. Then demuxer.c calls demux_close_asf() which frees the field
again. Fix by removing the free() in demux_open_asf().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23313 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-14 01:23:54 +00:00
compn 98a3000eca add txd codec, works with http://samples.mplayerhq.hu/game-formats/txd/fronten2.txd . 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23292 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-10 15:47:06 +00:00
reimar 9ef64e24e7 Fix indentation broken in r23287 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23290 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-10 14:05:06 +00:00
reimar 4ffc4db9da Support theora in mkv. Sample: http://samples.mplayerhq.hu/Matroska/theora.mkv 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23289 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-10 14:01:53 +00:00
reimar 8073174ddb Avoid code duplication in mkv demuxer for standard fourcc/extradata handling 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23288 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-10 13:58:57 +00:00
reimar 1e4b9a95b7 Ignore comments where no '=' follows the comment name (otherwise 
"album_ja=..." would result in "Album: ja=..." MPlayer output).
Patch by Nicolas George [nicolas george [at] ens fr].
See thread: "[PATCH] Equals in Ogg comments", Mon, 5 Mar 2007 10:50:02 +0100


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23280 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-09 20:10:14 +00:00
nicodvb e4d7bc4396 For DVR-MS: 
extract timing information from the payload extension, set key frames,
detect video frame boundaries, interpolate the average video frame time
using the known informations from past frames and timestamps.
Video data before the first video key frame is thrown away.
Patch by John Donaghy johnfdonaghy gmail com



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23257 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-07 21:58:42 +00:00
cehoyos fd7fa9ee0a Fix compilation after FFmpeg r8921 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23242 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-07 08:13:22 +00:00
eugeni 476078aed2 Fix NULL pointer dereference in demux_mkv that happens when 
demux_mkv_get_sub_lang (or demux_mkv_get_audio_lang) is called with an invalid
track number.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23205 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-01 23:04:21 +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
diego 49b64742ed Add general variables for either static or shared FFmpeg libraries. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23119 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-26 11:22:22 +00:00