a7a6e41c24
remove the registration descriptor from the PSM: writing the fourcc in it makes it total crap
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24931 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 17:43:39 +00:00
ddf7776199
100% cosmetics: reformatted with tabs and symmetric braces and removed useless braces and trailing tabs
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24930 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 11:43:03 +00:00
a6d6f18216
Clean up some fields in stheader.h structs
...
sh_video_t: void *video_out: only assigned to, never read. Remove.
sh_video_t: void *vfilter: change type to struct vf_instance_s *
sh_audio_t: void *afilter: change type to struct af_stream_s *
The latter two never hold different types so there's no reason to use
void *. Maybe they were originally defined that way because the
option of using pointers to incomplete struct types was missed (the
typedefs vf_instance_t and af_stream_t would require extra headers)?
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:14 +00:00
523a3fdf11
Remove unused variable:
...
demux_lavf.c:441: warning: unused variable 'g'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24896 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 15:49:53 +00:00
33772c1065
Disable function that is only used in disabled code, fixes warning:
...
yuv4mpeg.c:147: warning: 'y4m_snprint_xtags' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24887 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-30 08:06:39 +00:00
18acd7224d
Fix fps guessing
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24884 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-29 19:24:55 +00:00
dcf5dda469
Update to use newer libnemesi, should fix desync, fps guessing may fail now
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24883 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-29 18:31:47 +00:00
41951932f9
removed silly #if 1
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24878 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 20:14:22 +00:00
eb0627a45c
DEMUXER_TYPE_TV is always defined, thus removed corresponding #ifdef USE_TV.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24877 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 20:12:26 +00:00
7f3e4e1258
reindented previously modified code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24876 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 20:04:16 +00:00
af64793313
implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switching
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24873 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 19:15:43 +00:00
fd0f023657
permit identification and selection of programs
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24872 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 19:12:59 +00:00
d936414dc1
permit the transititions no stream <-> some streams and viceversa (needed for forthcoming program switching patch)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24871 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 19:04:37 +00:00
15ad71420f
moved to a new function handle_stream() the code to parse the streams and assign the demuxer_streams
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24870 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 19:00:07 +00:00
018d2ae172
in process_userdata() move debugging messages from stdout to stderr
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24867 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 12:50:21 +00:00
8d83daa1cf
removed funny calls to fflush(stdout) after mp_msg()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24866 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 12:45:31 +00:00
6fc30e89a5
removed more empty spaces and empty lines
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24865 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 12:42:00 +00:00
cb805dfa54
replaced giant if() with if(pre-calculated variable) (there was even a bug: PS doesn't necessarily contain mpeg12)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24864 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 12:39:53 +00:00
8ff6e8a567
cosmetics: removed tabs/empty lines/trailing spaces and done a partial reformatting where desperately needed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24862 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 12:33:56 +00:00
c9d49b63b1
cosmetics: moved to function find_video_codec() and reused in video_read_*() the code that identifies the various mpeg* formats
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24860 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-27 11:55:16 +00:00
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
5340c0c03c
add support for wavpack into matroska
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24833 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-21 22:57:42 +00:00
db06490509
Remove unused code and fix warning:
...
demux_real.c:147: warning: 'skip_str' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-21 12:38:18 +00:00
c610bb50be
Mark constant argument of mp_header_process_sequence_header as such.
...
fixes warning:
vd_mpegpes.c: In function 'decode':
vd_mpegpes.c:49: warning: passing argument 2 of 'mp_header_process_sequence_header' discards qualifiers from pointer target type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24812 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-19 10:08:02 +00:00
014b44de8e
add nellymoser codec to mplayer with internal fourcc NELL
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24792 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-16 13:06:35 +00:00
7713841e4d
Add -lavfdopts cryptokey
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24785 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-14 12:11:28 +00:00
7b356a6680
support Y800 in raw video
...
patch by Attila Ötvös, oattila chello hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24768 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-13 09:41:50 +00:00
9fba49e0bb
in update_stats() removed a wrong 'else' that would prevent h264 headers to be recognized:
...
all 0x12x headers were accounted for only in num_elementary_packets12x.
Fixes detection of certain H264 in ES/PS streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24701 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-04 17:15:06 +00:00
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
f334337426
support for DTS as specified in DVB (untested)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24696 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-03 21:39:01 +00:00
bc44b16cba
Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to normal PCM.
...
Make lavf demuxer set codec tag to AMVA in this case.
No need to use -ac +ffadpcmimaamva anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24694 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-03 15:27:02 +00:00
9e3315675d
Set biWidth/biHeight in fli demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24688 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:22:46 +00:00
2c1db11dd1
Make sure there is no uninitialized data in BITMAPINFOHEADER created by fli demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24687 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:18:33 +00:00
3b2eb5fec1
Remove ugly unused struct name from typedef
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24686 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:13:23 +00:00
2b9b873707
AMV demuxer and audio/video decoder
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24673 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-30 03:49:22 +00:00
fffb09b9b3
analyzeduration option for lavf demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24655 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:55:43 +00:00
b267bd3921
remove useless int->double conversion
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24654 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:49:02 +00:00
9b94c1387a
fix warnings
...
demux_lavf.c: In function ‘demux_open_lavf’:
demux_lavf.c:276: warning: assignment discards qualifiers from pointer target type
demux_lavf.c:280: warning: assignment discards qualifiers from pointer target type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24653 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:42:31 +00:00
1f2fa1ba48
fixed bug introduced with previous commit: patch_panscan() must work in the sequence_display_extension, not on se_ptr
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:20:41 +00:00
1cc65a7889
1000l, the tff flag was never cleared before being overwritten with the value on bff_mask;
...
also, the sequence extension pointer was set to point to the sequence_display_extension,
so the progressive_sequence was never set and the sde was being corrupted
patch by Christopher Montgomery (xhiphmont xiph org)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24650 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:13:26 +00:00
c0b42bc94a
h263 exposed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24645 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 11:41:25 +00:00
e1fa5aef51
Fix playback of streams with more than one audio track (only one supported).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-25 22:34:01 +00:00
e907bda20a
Simplify: initialize at declaration at the start of the function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24612 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:21:14 +00:00
fc686f0d6d
Get rid of rather pointless asserts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24611 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:18:47 +00:00
b12a08fe6a
demux_audio.c: Fix timestamp handling
...
The code calculated the pts values of audio packets by adding the length
of the current packet to the pts of the previous one. The length of the
previous packet should be added instead. This broke WAV timestamps near
the end of the stream where a short packet occurs.
Change the code to store the pts of the next packet instead of the last
one. This fixes the WAV timestamps and allows some simplifications.
MP3 timestamps are not affected as packets are always treated as
constant decoded length, and FLAC timestamps still have worse problems
(FLAC is treated as as if it was constant bitrate even though it isn't).
Also store the timestamps as double instead of float.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24609 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 21:49:56 +00:00
719cb34fb6
removed unused function parameters
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24590 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-22 08:40:02 +00:00
02bcb8e85c
in ts_detect_streams() moved the iteration condition inside the loop
...
because it depends on the updated value of stream_tell();
(fixes infinite wait on enctrypted TS streams)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24589 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-22 08:29:25 +00:00
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
f5656d7017
Add comment that clears up what _WINGDI_H is for.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24570 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 10:56:29 +00:00
304a901fcf
reverted useless r24539
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24540 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 21:26:20 +00:00
87e3530225
added monkey audio fourcc in wave header
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 20:17:22 +00:00
16bd058e20
Add support for cook audio (though most .rm files don't work with lavf
...
demuxer anyway)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24538 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 19:33:58 +00:00
544a306147
Avoid one more code duplication
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24527 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 13:25:56 +00:00
b03ca2821f
get rid of pointless size parameter for tmf_load_chunk
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24526 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 12:13:45 +00:00
40f7ef2fb5
Avoid using demux->stream->end_pos, it rarely does any good.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:56:24 +00:00
5ea0bc8d0e
Slightly simplify IsValidAudioPacket
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24524 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:44:51 +00:00
6bfcbe1e81
Simplify another two ifs into one
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24523 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:41:47 +00:00
7c8fcecc13
Make one mp_msg call out of 3
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24522 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:35:35 +00:00
6954f5c634
Simpler and more robust tar parsing
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24521 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:33:31 +00:00
0d74d82c74
Get rid of bloated ty_extension function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24520 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:03:38 +00:00
749b59ce6c
Do not uselessly name structs
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24519 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:59:27 +00:00
32c6bdf8c7
Remove another variable and reorder to avoid wasting space due to alignment
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24518 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:58:06 +00:00
41f50de3d0
PTS should be passed as int64_t to demux_ty_CopyToDemuxPacket
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24517 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:55:30 +00:00
c1bb529a3e
Remove now useless parameters from demux_ty_CopyToDemuxPacket
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24516 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:54:37 +00:00
ee9b0c8066
Remove more unused code and variables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24515 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:52:36 +00:00
c7303ab055
cosmetics: Fix typo in function name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24514 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:07:08 +00:00
a353d4e055
Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24510 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 07:46:38 +00:00
eaf7b8614f
live recordings can contain 0-size type 0 chunks, ignore them instead
...
of erroring out.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24509 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 21:17:48 +00:00
92f501d8b2
Move some more variable declarations
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24508 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 21:03:08 +00:00
abac8f8fab
Remove tabs and trailing whitespace
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24507 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:59:05 +00:00
d1ee624657
A few more useless ()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:49:36 +00:00
bf86cc9f87
Minor simplifications
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24505 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:48:04 +00:00
9bb5a91413
Further simplify demux_ty_FindESHeader
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24504 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:41:32 +00:00
99ef8adf6f
Optimize demux_ty_FindESHeader
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24503 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:37:30 +00:00
9d885bbbe8
Remove some commented-out debugging code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24502 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:18:00 +00:00
7ffd4426a3
Fix demux_ty_FindESHeader so it won't overread
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24501 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:09:39 +00:00
abfe1d69a1
Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24500 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:08:42 +00:00
f1f27ada1a
Remove unused demux_ty_FindESPacket parameter
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24499 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:55:09 +00:00
8d8edc990a
Simplify demux_ty_FindESHeader
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24498 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:53:09 +00:00
fb090bd8fa
Move variable declarations into the block where they are used
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24497 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:46:54 +00:00
15940ebaff
Another piece of duplicate code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24496 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:34:17 +00:00
7d7cfea105
Avoid a big piece of duplicated code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24495 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:30:25 +00:00
cb4d79be6b
Get rid of more code duplication
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24494 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:13:47 +00:00
5072dde419
Simplify XDS handling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24493 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 19:07:50 +00:00
6b7b78b9a8
Reduce code duplication
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24492 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:58:32 +00:00
c30f384128
Greatly simplify IsValidAudioPacket, though this might break something
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24491 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:54:14 +00:00
8f09299308
Simplify IsValidAudioPacket
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24490 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:50:25 +00:00
26369de7a9
Do not misuse a_streams for private info, demuxer->priv is for that!
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24489 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:40:57 +00:00
512a3a03be
Use AV_RB24
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24488 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:32:34 +00:00
54562a6084
get rid of pointless pesFileId variables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24487 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:31:14 +00:00
b65c7919ca
Simplify AV_RB32 / 256 -> AV_RB24
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24486 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:26:55 +00:00
394304bd5a
Use AV_RB32 instead of tivobuffer2hostlong
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24485 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:23:13 +00:00
c09ba25466
Yet more cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24484 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:19:10 +00:00
a6a96ab944
Move timestamps to int64_t and use MP_NOPTS_VALUE
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24483 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 18:03:36 +00:00
0c71c038df
Demuxers are _not_ supposed to set ds->pts!
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24482 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:56:22 +00:00
29e529c873
Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24481 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:39:48 +00:00
d967a56ee6
Another ty simplification
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24480 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:08:02 +00:00
cd59dbdab7
Remove unused variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24479 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:06:04 +00:00
b49196162c
tmf_totalsize is not used either, remove it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24478 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:04:36 +00:00
5789ab4ab7
More simplifications
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24477 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:03:26 +00:00
56f5ab430f
Get rid of some quite pointless variables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 17:00:09 +00:00
4e9311b1de
Move boundary check before use!
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:58:31 +00:00
37fbb9e2b0
Remove unused tmf_totalchunks
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24473 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:45:52 +00:00
bd5e05cde4
Simplify EOF handling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24472 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:44:52 +00:00
9ec6875d20
Simplify tmf_filetooffset
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24471 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:42:46 +00:00
1498c9b7d0
Small simplifications
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24470 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:21:12 +00:00
55dac8bb6f
10l, placed terminating 0 at the wrong place.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24469 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:12:33 +00:00
d85a609547
Avoid strlcpy, tar headers already have space to ensure 0-termination
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:12:02 +00:00
97f633a083
Do not ignore last chunk in .tmf files, it will cause part of the file to be
...
missing during playback.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24467 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 16:04:12 +00:00
4fb393a73b
Cosmetics: remove lots of useless () and {}.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24466 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 15:52:46 +00:00
2334d91da4
Use CHUNKSIZE define in a few more places
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24465 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 15:33:21 +00:00
5ebf63afcd
Simplify ty_extensionis
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24464 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 15:28:47 +00:00
89c39c06d0
Make demux_ty internal functions static
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24463 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 15:19:45 +00:00
5ab9dde9d7
Use strtol instead of horribly suboptimal ty_octaltodecimal
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24462 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 15:12:46 +00:00
6474da1414
added monkey audio file extensions to extension table
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24449 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 17:06:36 +00:00
429b15b71b
Check wLongsPerEntry before using it.
...
This fixes a potential crash for some values of it.
As a side effect it works around broken callocs with an integer
overflow vulnerability, but using MPlayer on such systems should
never be assumed to be safe!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24447 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 15:18:57 +00:00
5f9fbb7124
Remove useless preprocessor check, _WINGDI_H is never defined.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24446 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 14:12:06 +00:00
43bd3a468e
warning fixes:
...
input.c: In function 'mp_input_set_section':
input.c:1640: warning: suggest parentheses around assignment used as truth value
input.c:1643: warning: suggest parentheses around assignment used as truth value
mga_common.c: In function 'mga_init':
mga_common.c:394: warning: suggest parentheses around assignment used as truth value
playtreeparser.c: In function 'parse_smil':
playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'ts_parse':
libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'demux_open_ts':
libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 13:16:30 +00:00
26bee6f728
Replace constant by appropriate define
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24443 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 11:23:32 +00:00
0723947265
warning fix:
...
demux_mov.c: In function 'mov_check_file':
demux_mov.c:504: warning: label 'skip_chunk' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24378 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:54:57 +00:00
8cbcc28e06
warning fix:
...
demux_lmlm4.c: In function 'demux_lmlm4_fill_buffer':
demux_lmlm4.c:215: warning: label 'hdr' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24377 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:48:51 +00:00
228232d2f4
Add nuv codec tag mapping
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24375 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:22:30 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
uau
diego
lu_zero
aurel
compn
reimar
voroshil
henry
cehoyos
ben
zuxy
michael
rtogni
attila
eugeni
corey
ods15