1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 20:32:13 +00:00
Commit Graph

2801 Commits

Author SHA1 Message Date
reimar
20dce6fe36 Mark lavfpref demuxer as safe, so it that it is actually used for e.g.
nuv as it was planned.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24374 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 08:47:53 +00:00
nicodvb
1dbfe77925 added .stream_aspect to st_video_t: if non-zero and if not specified otherwise
by the user the video pipeline will use it as current aspect ratio


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24319 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 15:54:45 +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
diego
1c12e78686 Fix warnings:
demux_mkv.c: In function 'demux_mkv_read_chapters':
demux_mkv.c:1299: warning: unused variable 'mkv_d'
demux_mkv.c: In function 'handle_subtitles':
demux_mkv.c:2740: warning: unused variable 'mkv_d'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24219 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-26 20:46:38 +00:00
reimar
8138eb7b5f Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
more proper support for multi-codec tracks).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24202 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 18:09:00 +00:00
diego
6f33963721 warning fix:
demux_mov.c:44: warning: redundant redeclaration of 'vo_sub'
../libvo/sub.h:64: warning: previous declaration of 'vo_sub' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24192 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:56:43 +00:00
diego
a0c2348a70 Remove redundant variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24167 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:12:31 +00:00
diego
6f75e1216c Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24164 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:02:16 +00:00
reimar
4e19d8fe2f Add missing pixelformat conversion function prototype
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24144 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-24 20:59:55 +00:00
diego
4225bf59d4 Remove silly #ifdef around the complete file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24138 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-24 11:06:07 +00:00
cehoyos
374de7f61f Fix compilation of live555 support after FFmpegs r10173.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24123 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-22 23:37:06 +00:00
reimar
80ef41dccf We can support SEEK_END seeks only when stream->end_pos is known
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24105 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-20 09:28:44 +00:00
reimar
08dd16470b Add support for AVSEEK_SIZE in demux_lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24104 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-20 09:27:47 +00:00
reimar
afe879eb99 Do not seek to an invalid position.
Patch by {emild [at] cs technion ac il}


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24102 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-19 21:22:27 +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
483453ff8b Fix detection of xan audio. -noidx or -forceidx still is necessary
to detect audio at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23985 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-01 09:01:28 +00:00
michael
fad572fc72 get rid of this idiotic i_certify_that_my_video_stream_does_not_use_b_frames
muxer_lavf can now generate correct files with b frames as long as the timestamps
provided to it are correct (they should be with lavc encoding, expect trouble with
stream copy though)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23976 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:28:47 +00:00
michael
8067c7b5ca make muxer store the provided timestamps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23975 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:24:53 +00:00
reimar
3b9d93025f Use the standard inline instead of __inline
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 13:58:45 +00:00
reimar
43f83d25be Another missed case-range
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23934 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 13:55:51 +00:00
reimar
73e967ea97 Do not use gnu case-range extension if it's easy to avoid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23933 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 13:54:15 +00:00
diego
22fc24fe56 cosmetics: misc typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-28 14:28:38 +00:00
reimar
f322399e38 Remove extern index_mode, it is already in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23886 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 21:00:33 +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
7cd6c01aca Simplify: use FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23861 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-25 17:31:34 +00:00
reimar
d02f928bc3 Remove some useless "extern" before function prototypes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23860 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-25 17:29:29 +00:00
rtogni
4b2b42adfa Fix for bugzilla #835
1) set audio language preferences (on command line or in ~/.mplayer/config).
(say, alang = Japanese[jpn],ja,jp,jpn,English[eng],en,eng,ko,ru,rus)
2) play a transport stream whose audio streams are not labeled
-> no audio

Patch by Sergey Svishchev >>> svs - ropnet ru <<< on bugzilla

Blessed by nicodvb


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23855 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-24 21:04:08 +00:00
nicodvb
72fedc8425 fixed bug introduced with the addition of get_ext_stream_properties()
that should close bug #843, too.
Patch by John Donaghy. Explanation:
The issue is that get_ext_stream_properties shouldnt be returning
false when no extended stream properties are found for the stream in
question because that is not an error condition ... extended stream
properties are optional. The only time this function should return
false is when the buffer overrun checks fail.





git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23823 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-18 22:16:08 +00:00
reimar
434cf0c9eb Avoid crash if a non-existent audio track is selected with -aid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23790 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-16 14:01:53 +00:00
reimar
8dda469fc0 Use stream_read_qword_le
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23779 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-14 09:01:44 +00:00
aurel
8f167a73b8 add support for subtitles thru lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23778 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-13 21:15:24 +00:00
attila
e3d05e9971 Fix segfault if an 'strf' chunk couldn't be found in avi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23772 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-13 14:39:18 +00:00
aurel
338f0e6a1f fix typo in a comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23771 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-13 13:23:41 +00:00
zuxy
bc722a5236 fix unaligned memory access in asfheader.c, courtesy of Balatoni Denes
(dbalatoni AT programozo DOT hu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23757 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-10 02:02:21 +00:00
nicodvb
357b96679e 100% cosmetics: reindentation and removal of trailing spaces
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23743 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-08 10:11:36 +00:00
nicodvb
30f3c76528 unified the skip of header and stuffing bytes after the parsing of pes_extension[12] fields
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23742 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-08 10:06:47 +00:00
nicodvb
2f4f674331 10l, forgot to skip the stuffing bytes eventually prepended to vc1 packets (identified by pes_extension2 subid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23731 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:56:14 +00:00
nicodvb
836ffdb9f4 cosmetics: split separate instructions in separate lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23730 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:31:57 +00:00
nicodvb
1c4710b110 proper parsing of pes_extension[12] fields (replaces the previous code that relied on specific flags set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23729 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:22:47 +00:00
reimar
01e1ab57ed Add some missing frees.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23724 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-05 22:06:05 +00:00
reimar
4c4a1070fe Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
instead of plain strlcat/strlcpy


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-05 22:01:07 +00:00
diego
3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
diego
437e32353f Consistently use filename as multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23707 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 21:34:39 +00:00
reimar
f58c64c3f3 Use proper PRI?64 format strings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23657 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:54:56 +00:00
reimar
ffd28484e5 Remove unused and trivial string variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23655 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:12:59 +00:00
reimar
05a637973d Fix format string to match actual type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23652 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:08:22 +00:00
reimar
4e9363a8bb index_mode is already defined in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23650 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:34:16 +00:00
reimar
33d26c72cf Get rid of: useless variable, useless cast and void * arithmetic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23648 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:21:50 +00:00
reimar
4badc643ae Use AV_RL32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23647 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:20:17 +00:00
reimar
4d4dd84726 Fix format strings to match argument type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23646 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:09:08 +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
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
diego
61a6e06a52 Add CXX include flags to dependency file generation CFLAGS to generate correct
dependencies for C++ source files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23116 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 10:36:59 +00:00
diego
5a8c8aadef cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:35:35 +00:00
diego
56c96cec50 Declarations and code should not be mixed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 00:03:27 +00:00
diego
62cf4b0c60 Add support for Bethesda Software VID video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23106 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 00:02:23 +00:00
ods15
24f0958e5a compilation fix, manually include help_mp.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23102 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-24 09:05:54 +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
nicodvb
dfd0190a6d with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-20 21:49:49 +00:00
reimar
5e00b162bb Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
regardless of actual audio codec.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23008 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-16 20:08:29 +00:00
reimar
720fa4936a Use lavf_preferred mechanism to replace more extension-based detection hacks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22990 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-14 10:07:36 +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
nicodvb
745c0b9c38 added :interleaving2, a better method to determine which stream whouls be flushed
at every iteration of the loop (based on the lowest percentage of buffer used
- same algo as libavformat)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22947 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 16:15:41 +00:00
nicodvb
ee3adc95aa in mpegfile_write_header(only for mpeg1/2) don't overwrite the values of bufsize with dwSuggestedBufferSize (those values are completely invented)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:09:56 +00:00
nicodvb
76429f1c97 reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22944 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:00:47 +00:00
nicodvb
4cdcd89714 in the system header set audio_locked/video_locked only for dvd and vcd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22943 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:00:05 +00:00
nicodvb
c675883bb4 small syntax fix: muxrate is expressed in units of 400 bits/second, not 50 bytes per second
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22942 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 09:50:27 +00:00
reimar
03bc9d7f97 Start to separate bad-autodetection hacks from other stuff in extension-based
demuxer selection.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 17:41:17 +00:00
diego
ad730514fa .dxa files should be handled by libavformat.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:56:26 +00:00
diego
224fd95f9c support for C93 video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:50:33 +00:00
nicodvb
3e8e92dc2f 10l, the scr must be reset before overwriting the first pack with the correct system header (format=mpeg1|2)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:42:28 +00:00
diego
31a7f77164 support for THP ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22934 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:31:12 +00:00
nicodvb
acb512df10 reversed r22879 until I discover why it's giving so many sync problems; I'll eventually recommit it in a fixed form
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22927 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 08:51:26 +00:00
reimar
60ecafec69 BMP support for mf://
Patch by lode leroy [lode_leroy hotmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22921 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-06 16:58:00 +00:00
cehoyos
0c3c6dd46e Use teardownMediaSession() instead of teardownMediaSubsession()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22911 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-03 17:00:27 +00:00
uau
208d4343ef "()" to "(void)" function param list fixes
patch from Stefan Huehner, stefan huehner org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 21:59:54 +00:00
nicodvb
5ca85e87e8 removed init_apts and init_vpts; added :adelay in addition to :vdelay
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22899 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 21:27:47 +00:00
nicodvb
fc527ebd04 cosmetics: removed trailing spaces
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22897 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 20:03:24 +00:00
diego
fc5643ea21 Add support for the THP game format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22894 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 15:59:44 +00:00
nicodvb
f6314c2220 in flush_buffers() removed code that required the presence of an amount of audio data >= video data in the temporal domain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22879 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 12:25:31 +00:00
cehoyos
407c037cfb Support h264 over rtsp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22870 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 03:03:05 +00:00
cehoyos
46fbb1bd66 Cosmetics: Move variable declaration and initialization up.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22869 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 03:00:47 +00:00
cehoyos
927cde6251 Handle X-QT extradata in a slightly more correct way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-26 09:35:03 +00:00
cehoyos
a2177f8bfc Fix filepos calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22777 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-22 10:14:32 +00:00
cehoyos
65b9ac6426 Every X-QT stream needs video frame rate (not just avc, mpeg4 and svq3)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22774 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-22 10:01:20 +00:00
diego
5f6965df5d Move libav* include CFLAGS to mpcommon.mak instead of duplicating them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22735 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-18 22:49:37 +00:00
diego
132dd09be9 Move setting CXXFLAGS to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22731 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-18 21:58:28 +00:00
compn
a261d54b01 add fourcc for dxa files, approved by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22708 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-17 21:21:04 +00:00
uau
8b59dd4d83 Matroska seeking fixes
If a relative seek forward went past the last index position the
Matroska demuxer did not seek to any index position. It did however set
the mkv_d->skip_to_timecode variable which meant that the next
fill_buffer() call would read from the current position until the target
position (probably the end of the file). Fix this by changing the code
to seek to the last index position if that is between the current and
target positions.

Also change backwards relative seek to accept an exactly matching index
position (<= vs <) and reorganize the seeking conditionals to allow
making the above change without turning the code into a complete mess.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22634 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-16 14:55:41 +00:00
diego
a6eca2eef8 Use explicit path for headers from the loader/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 22:34:45 +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
diego
8868c13dc7 Add live555 include flags to CXXFLAGS only.
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22621 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:07:12 +00:00
reimar
ec62af965e Check for eof in loop searching for data chunk.
Fixes bug #775.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22604 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 10:38:51 +00:00
diego
5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +00:00
diego
60b39e2786 Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 12:10:57 +00:00
nicodvb
8eee548895 cosmetics: renamed variable amr as headersize, more meaningful; patch by Carl Eugen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22537 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 22:13:48 +00:00
diego
4a75f5849f Source files should not contain non-ASCII characters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 15:52:34 +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
ods15
a8f031fbc0 remove some lines which should have never been in demux_nut.c, broke CPU
percentage meter for audio only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22502 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-09 15:40:03 +00:00