RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 05:22:23 +00:00
Code Issues Releases Wiki Activity
26,819 Commits 41 Branches 86 Tags 152 MiB
08678c2c6a
Commit Graph

3050 Commits

Author SHA1 Message Date
reimar
c6894da2cd Disable reading of flac metadata, mere metadata is not worth such a mess. 
If you want this, fix the implementation to not crash at least occasionally,
or wait till I get bored enough to fix it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25918 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 22:04:46 +00:00
reimar
80d22ebb9f Properly check length of flac metadata. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25917 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 22:00:58 +00:00
reimar
1dc1db13a1 Fix r25817 to not always destroy codec_tag, this broke playback of e.g. ape files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25914 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 19:05:36 +00:00
reimar
5960ddb8e5 Use defines to give names to the different seek flags. 
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 15:11:38 +00:00
reimar
4134a853e4 Make mov subtitles work with -ass 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25909 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 14:30:53 +00:00
ivo
f3216dba06 clarify comments/docs about lav* being the preferred place to implement new 
codecs and (de)muxers, except for wrappers around external libraries and
codecs and (de)muxers requiring binary support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25908 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-28 22:09:21 +00:00
reimar
194517d82a Support CODEC_ID_MOV_TEXT 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25907 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-28 18:29:26 +00:00
ivo
572d74b206 copy note on new demuxers and codecs to the top of the array as well to be 
extra clear


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25904 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-28 16:03:22 +00:00
ivo
1203499e51 note on new demuxers and codecs, add them to lav* instead of libmp* 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25900 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-28 12:11:41 +00:00
diego
fe9ec3ffdd Consistently use uppercase filename as multiple inclusion guard. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-28 01:32:52 +00:00
reimar
4ddc96baae Support mov subtitle format directly instead of converting to text in the demuxer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25883 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-27 16:13:21 +00:00
reimar
e4cf805580 Prefer lavf mov demuxer over our own, it should work better most of the time now. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25874 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-27 09:08:54 +00:00
reimar
3560751199 Simplify init_vobsub: pass palette via extradata. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25873 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 23:52:15 +00:00
reimar
0e75f48aca 100l, inverted condition for AVSEEK_FLAG_BACKWARD 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25871 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 22:25:47 +00:00
reimar
a3bb9882b7 Used wrong condition for using AVSEEK_FLAG_BACKWARD, it should depend on 
relative vs. absolute, not time- vs. percent-based seek.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25870 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 22:06:36 +00:00
reimar
a5d95b439d Cosmetics: remove some trailing whitespace 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25869 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 21:45:31 +00:00
reimar
977300acd5 Add QDM2 codec identifier 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 21:41:30 +00:00
reimar
da2d2bd84a Partially support vobsub subtitles from lavf demuxers (palette support missing) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25867 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 21:17:08 +00:00
nicodvb
4205c1a8b7 in the crazy ES probing code return DEMUXER_TYPE_MPEG_ES (mpeg12v) only if we have at least a couple of SEQ/GOP startcodes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25866 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 19:01:13 +00:00
nicodvb
7186ce0f76 in the PMT stream_type==0x11 indicates AAC in LATM streams, that now libfaad can decode; re-added 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25865 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-26 18:47:39 +00:00
rtogni
a27f74e98c Allow overriding the codec_tag for audio codecs, and always override 
codec_tag for PCM codecs (codec_id from lavf is correct, but the 
codec_tag may be non-zero and wrong).

Also fixes bugzilla #983


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25817 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-20 12:57:53 +00:00
reimar
eb6b6698a1 Fix endless loop if nAvgBytesPerSec is 0. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25800 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-19 14:43:58 +00:00
reimar
fd35d1bfe3 Avoid a division by 0 if i_bps is 0. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25799 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-19 14:38:24 +00:00
diego
07c3d34644 Add name to email address. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25796 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-19 13:40:13 +00:00
reimar
80442027a0 Put bff_mask into muxer context instead of a global variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25748 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 21:06:30 +00:00
reimar
22f97dcd49 Mark qt default palette tables as const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25736 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 16:04:58 +00:00
reimar
35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 16:00:39 +00:00
reimar
df7c312313 First step towards making all demuxer_desc_t const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25734 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 15:47:24 +00:00
reimar
f1df834442 Remove a useless assignment (there is an if just a few lines above 
that ensures those two are already equal).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25733 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 15:41:21 +00:00
reimar
b58f5adbfd Add a forgotten #ifdef USE_ASS around ass_free_track 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25730 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 13:37:19 +00:00
nicodvb
194c1219db moved pes_header from file-static to send_mpeg_pes_packet_ll() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25704 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 09:34:43 +00:00
reimar
7172339ff9 Write functions used by send_mpeg_*_packet may _not_ modify data 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25701 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 16:05:04 +00:00
reimar
16ca65e83a ps1_header and ps2_header should be const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25700 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 15:55:52 +00:00
reimar
d3fb56248d Add a few "const" attributes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25699 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 15:50:06 +00:00
eugeni
46c4f6ae9f Add libass support to demux_lavf. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25687 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 01:14:45 +00:00
eugeni
55b1facb6c Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment(). 
These attachments are passed to libass after demuxer is opened.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 01:12:39 +00:00
eugeni
c0e1f353e0 Add demuxer interface for attachments. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25685 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-12 01:12:36 +00:00
eugeni
0d36212f39 Remove global_ass_track. Instead create an ass_track for each 't' track. 
Global_ass_track obviously can not work when there is more than one 't tracks,
their lines will be mixed up.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:20 +00:00
eugeni
bdb6a07d2a Move all subtitle parsing from mkv demuxer to update_subtitles(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25683 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:17 +00:00
eugeni
d9d27bb8c4 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25682 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:15 +00:00
eugeni
2d0715a915 Set extradata for subtitle tracks in mkv demuxer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25681 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:13 +00:00
eugeni
18e9531401 Add extradata to sh_sub_t. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25680 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:10 +00:00
eugeni
4c512b27c3 Factorize private data decoding for subtitle tracks in mkv demuxer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25679 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-11 21:45:08 +00:00
reimar
f9e6def939 Codecdata must always be malloc'd, fixes free being called with an 
invalid pointer when freeing codecdata.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25658 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-09 07:18:14 +00:00
eugeni
0039652a08 Deallocate audio track codecdata. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25642 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-07 14:13:50 +00:00
diego
e27d606714 Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved 
for the system, names starting with _ are reserved at file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-06 23:20:15 +00:00
rtogni
2bc03fd010 Don't overread audio data 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25628 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-06 14:30:25 +00:00
rtogni
b9a788edaa Don't dynamically allocate sub_packet_lengths[] in raac demuxing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25627 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-06 14:10:30 +00:00
nicodvb
a913d90614 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25603 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-05 14:28:57 +00:00
nicodvb
104f3ecf68 in the PMT stream_type==0x11 identified AAC in LATM-over-LOAS syntax that isn't decodable yet, removed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25599 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-05 13:03:44 +00:00
diego
2b6af2000b Add multiple inclusion guards to all header files that lack them. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-01 21:35:58 +00:00
diego
d53ff2ca72 Consistently use just the name of the #ifdef directive in #endif comments. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25574 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-01 20:00:20 +00:00
diego
828f16740d Fix wrong #endif comment that does not match the #ifdef directive. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25573 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-01 19:59:01 +00:00
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-31 16:15:50 +00:00
reimar
951bc25530 Add some const/static qualifiers as appropriate 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25523 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-24 16:27:52 +00:00
reimar
f9dd4f27ba Use realloc_struct in more places for consistency 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25522 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-24 16:05:09 +00:00
reimar
6a956da665 Get rid of some of the more excessive () and casts. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25521 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-24 15:56:33 +00:00
lu_zero
cb0b8fa5ff Make sure we have an rtsp session 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25518 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-24 01:54:30 +00:00
reimar
e53bba09a9 Replace LOAD_LE32 etc. by AV_RL32 etc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-23 16:46:24 +00:00
reimar
c42fa08085 Add a read_varlen function to reduce some code duplication 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25515 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-23 16:42:54 +00:00
reimar
ec029a1034 100l, fix compilation. 
Commited old patch that used alloc_put_byte instead of av_alloc_put_byte


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25506 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 18:32:45 +00:00
reimar
37b1d73ae3 Set is_streamed correctly, should make network playback work more reliably. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25500 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 16:23:42 +00:00
reimar
de4908b644 Get rid of URLProtocol mess (especially problematic since it made use 
of a non-constant global variable) and use ByteIOContext directly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 16:22:54 +00:00
reimar
77e2ce680b Move ds->current=NULL; further up to the free_demux_packet. 
This does not change behaviour in the normal case but avoids
a double-free if the function is aborted via a signal handler.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25472 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-20 11:21:02 +00:00
ulion
4a901e4db0 Vobsub support tridx setting in .idx file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25460 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-19 08:35:40 +00:00
diego
abb3ce5a5b Remove useless stray #include. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25426 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-16 23:57:34 +00:00
cehoyos
5eaf53d925 Cosmetics: Fix indentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25388 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-14 07:15:13 +00:00
cehoyos
5b122fd41a Set correct image format for 24bit "raw " in mov files. 
Patch by Chas Williams, chas A cmf D nrl D navy D mil


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25387 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-14 07:14:33 +00:00
ulion
e34efdf167 Add demuxer functions for chapter feature. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25386 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-13 12:51:05 +00:00
ulion
24dafeee09 Fix memory leak that tmp allocated but maybe not used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25342 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-10 14:43:09 +00:00
ulion
ef37a3be9c Move temp variable declaration into inner loop scope. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25332 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-10 04:37:26 +00:00
ulion
6e9b19642a Convert vobsub custom colors from rgb to yuv using a common function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25326 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-09 06:58:57 +00:00
ulion
151e8cceec Move vobsub palette->yuv convert code into a common function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25320 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-08 12:15:03 +00:00
ulion
fad92e57fa Restore y of palette into the same value range as it was in the .ifo file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25317 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-08 02:38:02 +00:00
lu_zero
298578466c Rename demuxer tags to clarify 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25298 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-04 15:26:56 +00:00
lu_zero
60d92ead61 Remove non necessary header 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25295 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-04 13:11:48 +00:00
lu_zero
a1fe08b750 Make libnemesi use specific struct and DEMUXER_TYPE 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-04 13:05:25 +00:00
reimar
b8a403f124 Make m_option_t arrays referenced by cfg-common.h const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25269 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 21:26:23 +00:00
reimar
1f8007f0fd Table of ID3 genres should be const as well 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25268 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 20:48:16 +00:00
cehoyos
8d5573a14e Fix playback of streams with more than one video track (only one supported). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25265 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 18:04:14 +00:00
reimar
4cc00dc192 Finally replace get_uint?? by AV_RL?? 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25234 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 15:12:05 +00:00
reimar
8da10f7b0f Get rid of annoying, space-wasting sizeof(uint32_t) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 15:01:55 +00:00
reimar
18499a94d9 Bigendian fix for ogg in AVI 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25232 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 15:00:22 +00:00
reimar
0034f7802d Use a loop instead of doing the same thing three times 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25231 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 14:58:00 +00:00
reimar
744797543e Use a pointer variable for extradata to simplify init_avi_with_ogg 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25230 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 14:55:58 +00:00
reimar
7f98fc4ad3 Set sh_video->format when parsing aviheader, otherwise it might never 
be set correctly when using demux_demuxers (like with ogg stream in AVI).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25229 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 14:29:53 +00:00
reimar
45cfc7af1a Remove some pointless casts 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25228 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 14:22:27 +00:00
reimar
9816936cb6 Create correct extradata for vorbis audio when used as avi sub-demuxer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25227 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 14:09:48 +00:00
reimar
7eb46c40d3 Fix some typos in comments, grammar is still bad. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 13:50:30 +00:00
reimar
a47c3bec6d Fix typos in comments to stop them hurting my eyes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-01 13:35:25 +00:00
michael
32b9034e23 simplify 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25221 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-30 23:46:32 +00:00
lu_zero
8e18e41638 Enable -rtsp-port for nemesi 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25184 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-27 21:31:47 +00:00
iive
958c41d9b6 Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071. 
Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo
Patch for muxer_lavf.c by me.
Approved by michaelni.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-23 10:44:33 +00:00
lu_zero
5b1720b92b Enable Theora support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25144 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-23 07:25:39 +00:00
iive
07c7b70714 Fix compilation error. 
FFmpeg commit r11071 removed the static ByteIOContext from AVFormatContext
and replaced it with a dynamic one.
Thus muxer_lavf.c needs to be modified to reflect the change.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25135 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-22 00:22:29 +00:00
lu_zero
2978db1577 AAC support (aac-hbr only) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25132 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-21 13:03:58 +00:00
lu_zero
8b03e2ecce Media Format to fourcc conversion (from amol) 
Factorize out some if clauses


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25131 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-21 13:03:08 +00:00
diego
adf572f304 Remove unused function write_psm_block(), fixes the warning: 
muxer_mpeg.c:763: warning: 'write_psm_block' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25126 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-21 09:14:01 +00:00
kostya
cf446beff5 Musepack SV8 lavc decoder support 
Patch okayed by Diego on IRC


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25120 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-20 17:08:12 +00:00
reimar
7342753348 100l, fix uint32_t* instead of uint32_t typo in demux_mf type->fourcc table 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25090 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-18 10:02:28 +00:00
reimar
aa93e8e60d Remove a pointless #ifdef 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25062 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-17 17:28:33 +00:00
reimar
d0326807a7 Replace if-else constructs for type -> fourcc mapping by a table in demux_mf 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-17 17:27:30 +00:00
rtogni
873a53b546 Print warning about encrypted audio tracks 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25055 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-15 22:16:41 +00:00
compn
48a2ba01e5 add tif support to demux_mf 
ok'd by diego and reimar


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25048 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-14 13:49:18 +00:00
lu_zero
90e6e28449 Check for second stream presence, fixes single stream playback (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25041 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 23:02:49 +00:00
lu_zero
bd391c1053 10l video != audio 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25040 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 23:02:09 +00:00
lu_zero
2127b47b47 support extradata for audio streams 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25039 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 23:01:25 +00:00
lu_zero
4d8aeade41 fetch metadata for audio (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25038 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 23:00:12 +00:00
lu_zero
746c248351 Revert stray commit r25027 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25037 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 22:57:22 +00:00
lu_zero
a910a6f799 Check for second stream presence, fixes single stream playback (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25034 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-13 14:29:02 +00:00
lu_zero
846db09188 10l video != audio 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25030 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 18:21:43 +00:00
lu_zero
0f51b5dacf support extradata for audio streams 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25029 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 16:56:23 +00:00
lu_zero
44429521ac fetch metadata for audio (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25028 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 16:39:09 +00:00
lu_zero
a8d68edd6b Add support for mpeg4video-es (from dario) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 16:32:45 +00:00
lu_zero
365836f628 fix forcefps (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25026 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 16:31:52 +00:00
lu_zero
979c51209f Refactor demux_nemesi (from amol) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25025 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-12 16:26:33 +00:00
reimar
5b7c961784 Fix typo in error message 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24976 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-06 08:12:19 +00:00
nicodvb
aa93810437 reindented 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24974 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-05 20:16:06 +00:00
nicodvb
a06eb8ac21 10l, setting a non-existent timestamp (default 0.0) when the pts flag isn't set in 
the PES header is just wrong; leave the default MP_NOPTS_VALUE instead


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24973 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-05 20:15:09 +00:00
nicodvb
5d934f8ea7 in video_read_frame() set the keyframe flag in demuxer->video when dealing with 
VIDEO_MPEG12 and picture_coding_type==I_FRAME; fixes seeking in avi streams
with MPEG1/2 video

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 23:05:51 +00:00
nicodvb
89a5add794 prevent unlikely memleak 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24938 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 20:06:28 +00:00
nicodvb
a5541ee85b 10l, priv->use_psm can be 1 only if the format is genmpeg2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 19:52:22 +00:00
nicodvb
cd0c142521 add streams to the PSM only if priv->use_psm is set, otherwise the muxer would 
write the map also for ordinary mpeg audio and video streams (wasting space)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24936 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 19:06:15 +00:00
nicodvb
3d584f9b18 moved to fix_parameters() the decision of the necessity of the PSM based on the format of the video stream 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 19:01:13 +00:00
nicodvb
ddd4c2e6d0 removed no more needed variable 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24934 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 18:52:08 +00:00
nicodvb
d48b6c6cf5 moved to fix_parameters() the code that decides if the PSM is needed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24933 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 18:50:41 +00:00
nicodvb
2edf5a5ad3 repeat the PSM once every second (in terms of delta_scr) otherwise playing the file from the middle would miss the first instance 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24932 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-02 17:48:27 +00:00
nicodvb
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
nicodvb
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
uau
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
diego
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
diego
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
lu_zero
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
lu_zero
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
uau
1f5bb6386e demuxer.c: Remove useless code 
Remove "while(1) { }" around two instances of code that always do
"return" in the loop body. No functionality changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-25 19:21:24 +00:00
aurel
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
diego
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