aurel
6d97b19a73
cosmetics: indentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27480 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 00:08:55 +00:00
aurel
68ac7b23dd
use new lavf API to grab sample_aspect_ratio from the demuxers
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27479 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-24 00:07:09 +00:00
aurel
03e568867e
demux_lavf: fix mp_seek behavior in case of seeking error
...
When trying to seek past the end of file, the ByteIOContext expect
that the stream is left in the same state as it was before the
tentative seek. stream_seek() does not meet this expectation.
It changes current position when seeking past the end of file.
Thus, it is necessary to reset the stream to its previous state
after a seek failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27459 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-13 00:01:31 +00:00
Uoti Urpala
92f0cba26b
Merge svn changes up to r27281
2008-07-15 02:59:27 +03:00
reimar
6da3883a44
1000l, fix demux_lavf compilation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27251 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:04:36 +00:00
reimar
3ee9460505
Correct stream-seekability tests in demux_audio and demux_lavf
...
Based on a patch by Alexander Kanavin (alexander.kanavin nokia com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27250 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 17:25:37 +00:00
Uoti Urpala
68e70b3ec3
Merge svn changes up to r27092
...
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
2008-06-17 05:04:32 +03:00
reimar
3e081f4563
Chapter support for lavf demuxer.
...
Patch by Anton Khirnov [wyskas gmail com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27090 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 15:54:29 +00:00
Uoti Urpala
a41db36b22
Merge svn changes up to r26783
...
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
2008-05-15 21:19:35 +03:00
diego
4adf8975a1
Use standard license headers with standard formatting.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:01:51 +00:00
michael
5f4cface7b
AVOption support for lavf demuxing
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26728 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:29:38 +00:00
Uoti Urpala
66bd120a3a
Move dvdsub_id to options struct
...
Name the field "sub_id" as it's not specific to DVD subs.
Remove some other unused extern declarations together with dvdsub_id
from demux_mkv.c and demux_lavf.c.
2008-04-23 13:48:38 +03:00
Uoti Urpala
9b06b5ed85
Move correct_pts to options struct
2008-04-23 13:41:05 +03:00
reimar
11b4999712
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-16 12:03:34 +00:00
albeu
698142597e
Split the lavf taglists out of the lavf muxer to allow using libmpmux
...
without libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:46:21 +00:00
reimar
75535bba65
Set correct codec tag for raw rgb in mov, fixes
...
http://samples.mplayerhq.hu/mov/rawbgr24.mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26326 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 08:49:07 +00:00
eugeni
7cc46c2e87
Support 'default' attribute for audio and subtitle tracks.
...
The first default track is chosen for playback if language-based selection
failes. Additionally, for audio tracks, the first one is chosen if there are
no default tracks at all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 16:55:46 +00:00
eugeni
36277e690e
Support switching to/from nosound in demux_lavf.
...
Also fixes a bug when pstreams[-1] could be accessed. It happens when
switching audio tracks if mplayer was run with '-nosound'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26126 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:57 +00:00
eugeni
439cfd5d9e
Don't select audio stream in lavf and mkv demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26123 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:52 +00:00
eugeni
c85a382afa
Don't select subtitle track in lavf and mkv demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:47 +00:00
eugeni
a2fad60c7f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
...
track language.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:39 +00:00
eugeni
18fea2aa49
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
...
language when available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26115 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:37 +00:00
diego
21c200e767
FFmpeg now uses different (unified) #include paths.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
eugeni
0a168fb8e0
Fix r26032: wrong sub stream id assigned to dvdsub_id.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26046 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 09:47:03 +00:00
eugeni
cfa0af8f17
Support -slang in lavf demuxer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26032 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-19 19:41:22 +00:00
reimar
3300ba4d46
Add speex tag
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25958 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-06 12:39:59 +00:00
reimar
40dca58f37
Allow demuxers to choose a default value for correct_pts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-03 12:14:29 +00:00
eugeni
fc5c09acd7
Add support for attachments in lavf demuxer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25932 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-30 08:10:25 +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
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
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
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
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
reimar
0c8d9ba25f
Include "internal" libavformat/riff.h also when dynamic libavformat is used
...
instead of duplicating typedefs and function prototypes in already three
different places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:28:11 +00:00
michael
9eb302dee8
sort
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21795 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 10:54:32 +00:00
michael
8f7f2ad9e0
first step toward amr-nb muxing support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 18:56:28 +00:00
aurel
d1c91ec012
add support for musepack native decoder from ffmpeg (require -demuxer lavf)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 00:40:49 +00:00
reimar
b9e8186ac3
Respect -noidx in lavf demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 21:37:00 +00:00
uau
2cfcfc4f22
Set AVFMT_FLAG_GENPTS if -correct-pts is used.
...
This should allow using -correct-pts (and thus filters which adjust pts
or add frames) with dvd or other mpeg container files by specifying
"-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2
decoder too but certainly not with internal demuxer.
Using this flag isn't quite optimal as it can cause extra buffering of
demuxed frames, but at least it's better than just failing until a more
complex solution is implemented.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 00:50:38 +00:00
diego
19300ef1db
support for Westwood SND1 audio
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21378 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 10:51:39 +00:00
nicodvb
a9eada9189
check we aren't short of sh_videos before allocating another one
...
and fail if the allocation doesn't succeed;
added support for video stream switching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:31:01 +00:00
diego
67efdbe07a
support for XAN DPCM audio
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 11:24:09 +00:00
diego
2f67bb7b34
support for some more fringe formats, still buggy ..
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 22:52:57 +00:00
diego
1fb5f0f90a
support flic video through lavf
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:35:10 +00:00
diego
84c9fdbab0
cosmetics: Restore alphabetical order, align both tables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 13:15:05 +00:00
diego
0245dc0efc
support for RoQ video and audio through libavformat
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:42:32 +00:00
diego
77b21dc757
support for Electronic Arts ADPCM audio
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:33:12 +00:00
diego
25d71db765
support for Delphine CIN audio and video
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:28:39 +00:00
diego
199d26ea92
support for Interplay DPCM audio
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 01:17:19 +00:00
diego
ac47a614cd
cosmetics: alphabetical order and prettyprinting for the CodecTag table
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:59:01 +00:00
diego
d495a2823f
support for Sierra VMD video
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:56:35 +00:00
diego
adf53a4caa
Add support for Tiertex SEQ video.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:20:55 +00:00
diego
61da56fefa
Add support for Westwood IMA ADPCM audio.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20947 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 23:42:47 +00:00
diego
508c93566d
Move some FourCC values from libavformat/riff.c to our private mapping.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20776 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 10:49:34 +00:00
reimar
8abf4e3f17
Add our own CODEC_ID -> fourcc translation tables so we do not need
...
to put them into ffmpeg.
Also adds support for S24BE and S8 audio formats, which fixes e.g.
http://samples.mplayerhq.hu/A-codecs/MACE/Bach1-1.aiff and
http://samples.mplayerhq.hu/MXF/ebu_small.mxf .
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20749 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 17:37:23 +00:00
reimar
9b128fa2e4
Implement absolute and percent-based seek
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20076 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 21:25:22 +00:00
nicodvb
b792548aa7
include forgotten limits.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19617 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-31 21:26:02 +00:00
nicodvb
735e934c58
added lavfdopts to pass options to libavformat
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-30 22:25:40 +00:00
reimar
c3cdf1ced9
Do not treat AV_NOPTS_VALUE as a valid duration value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19212 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 13:39:11 +00:00
reimar
902b1a22b1
Take start time into consideration when calculation percentage position
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19165 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-23 09:05:10 +00:00
diego
b5de6c39e6
Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
...
It served no apparent purpose anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19078 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 23:02:03 +00:00
reynaldo
32492483c0
drops casts from void * on malloc/calloc from libmpdemux code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 16:41:13 +00:00
rfelker
22bbf3a01b
more c++ decl crap
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18990 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 02:53:06 +00:00
pacman
5576e93b0f
Remove bogus stream_eof() test - av_read_frame() has its own buffer and can
...
still return usable data after the underlying stream_t has EOF'ed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18847 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-28 19:27:04 +00:00
nicodvb
4e5235e91f
support for -alang
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18778 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 19:24:17 +00:00
nicodvb
e9f0940c47
support for audio stream switching
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18765 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-20 19:57:16 +00:00
diego
a33158d60d
Convert printfs in aviprint.c to mp_msg and give the information printing
...
functions in this file a verbosity_level parameter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +00:00
diego
eebf08b978
Convert all if(verbose>X) to mp_msg_test calls.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
corey
1ab575101a
Second-try commit of this patch.
...
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
I've quadruple checked this time; hopefully I haven't missed anything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
corey
3f6e7ce5f5
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
michael
ec7b288ed5
10l 1000 fps fix
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17557 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-08 01:19:13 +00:00
corey
15debd85d2
1. Include audio_delay as an argument to demux_seek.
...
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
Other demuxers could be modified similarly in the future.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
diego
988281c471
Update licensing information: The FSF changed postal address.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17368 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-13 00:23:32 +00:00
nicodvb
ad978de549
added support for external libavformat
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-09 19:35:44 +00:00
gpoirier
b136fa417f
makes demux_lavf (-demuxer 35) use the framerate specified in the container
...
if it's set and only fall back to the codec framerate if the former is not
set.
This solves the issue of some avi's playing at 30000/1 fps instead of the
correct framerate.
Patch by Ivo < ivop AH euronet POIS nl >
Original thread:
Date: Sep 25, 2005 12:34 AM
Subject: [MPlayer-dev-eng] [PATCH] make demux_lavf use container framerate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16719 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-10 05:45:38 +00:00
ods15
d620029e4b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
...
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
rtognimp
cd68e1618b
Demuxer modularization
...
Demuxer selection by name with -demuxer command (bakward compatible)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
reimar
a426499a97
Hopefully finally fix the last commit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16136 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-28 14:14:13 +00:00
reimar
70c9aca23b
lavf demuxer with raw PCM fix (and a related hang)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16135 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-28 13:43:24 +00:00
michael
096500035d
LIBAVFORMAT_BUILD >= 4629
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16001 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 23:54:48 +00:00
faust3
47eb55b654
10l
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15820 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-26 15:32:09 +00:00
michael
2678394202
LIBAVFORMAT_BUILD >= 4624
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15309 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 02:03:58 +00:00
michael
7beeedc331
various (de)muxer_lavf fixes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15012 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-25 22:47:09 +00:00
michael
078ef11dda
set i_bps
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15008 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-25 11:09:42 +00:00
michael
93b2bacee5
discard streams we dont need
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15005 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-25 00:48:18 +00:00
nicodvb
fb8a0ddba2
discard lavf packets with wrong ids
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14612 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-30 09:13:28 +00:00
michael
50d7158d75
print build num
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13750 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-24 20:55:33 +00:00
michael
b3948a36d1
10l (mplayer doesnt like AV_NOPTS_VALUE)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13748 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-24 19:17:55 +00:00
michael
42315ddbb4
LIBAVFORMAT_BUILD >= 4619
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13608 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 22:24:07 +00:00
michael
35439875eb
segfault fix
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12464 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-12 22:48:15 +00:00
michael
057916ee65
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12305 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-26 19:55:55 +00:00
michael
9e29038395
seeking
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12169 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 17:20:52 +00:00
michael
532af04dba
avoid unneeded stream_reset()
...
aspect ratio support (rarely works ...)
author, title, ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12168 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 16:48:48 +00:00
michael
d854c5c06a
nicer EOF solution, mpeg-ps works now too
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12167 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 15:04:54 +00:00
michael
1c80573d19
libavformat really doesnt like it that the streams get stuck if the end is reached
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12166 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 14:51:10 +00:00
michael
8580ca5c5f
demux_lavf
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12165 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 14:26:04 +00:00