Commit Graph

113 Commits

Author SHA1 Message Date
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 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
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
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 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
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
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
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
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
compn 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
reimar 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
voroshil 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
voroshil 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
henry 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
henry 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
henry 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
ben 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
ben 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
reimar 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
reimar 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
reimar 20dce6fe36 Mark lavfpref demuxer as safe, so it that it is actually used for e.g.
nuv as it was planned.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24374 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 08:47:53 +00:00
reimar 80ef41dccf We can support SEEK_END seeks only when stream->end_pos is known
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24105 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-20 09:28:44 +00:00
reimar 08dd16470b Add support for AVSEEK_SIZE in demux_lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24104 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-20 09:27:47 +00:00
reimar afe879eb99 Do not seek to an invalid position.
Patch by {emild [at] cs technion ac il}


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24102 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-19 21:22:27 +00:00
aurel 8f167a73b8 add support for subtitles thru lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23778 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-13 21:15:24 +00:00
compn 98a3000eca add txd codec, works with http://samples.mplayerhq.hu/game-formats/txd/fronten2.txd .
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23292 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-10 15:47:06 +00:00
diego 62cf4b0c60 Add support for Bethesda Software VID video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23106 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 00:02:23 +00:00
nicodvb dfd0190a6d with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-20 21:49:49 +00:00
reimar 5e00b162bb Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files
regardless of actual audio codec.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23008 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-16 20:08:29 +00:00
reimar 720fa4936a Use lavf_preferred mechanism to replace more extension-based detection hacks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22990 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-14 10:07:36 +00:00
reimar ef91f5aad8 Add lavf_preferred demuxer for lavf formats we want to be probed
before our native demuxers and remove some now unneeded file-extension
hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-14 10:03:42 +00:00
diego 224fd95f9c support for C93 video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:50:33 +00:00
diego 31a7f77164 support for THP ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22934 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:31:12 +00:00
diego fc5643ea21 Add support for the THP game format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22894 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 15:59:44 +00:00
compn a261d54b01 add fourcc for dxa files, approved by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22708 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-17 21:21:04 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
nicodvb b14bee2928 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22458 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 16:23:18 +00:00
michael 296f360f82 dont set 0 nBlockAlign
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22284 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-20 16:16:53 +00:00
reimar 07b655f0e8 Support selecting a specific lavf demuxer and listing available ones via -lavfdopts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22168 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 22:15:20 +00:00
reimar 54ef26f173 Support 16bit bigendian PCM audio from libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22076 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-30 16:16:10 +00:00
reimar fa7d28e854 Remove ff_gcd prototype and include avutil.h instead where it is defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22013 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 10:49:43 +00:00
reimar 4b9ddc69a0 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 15:44:58 +00:00
reimar 3ccc6712e3 Forgotten CodecTag -> AVCodecTag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:33:34 +00:00
reimar abb0510502 Fix compilation after lavf changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:17:40 +00:00