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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
reimar
nicodvb
eugeni
diego
rtogni
lu_zero
ulion
cehoyos
michael
iive
kostya
compn
uau
aurel
voroshil
henry
ben