Commit Graph

154 Commits

Author SHA1 Message Date
diego 0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
gpoirier bf0e018a68 fix compilation w/ FFmpeg r15533
patch by Andrew Wason %rectalogic A rectalogic P com%


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 14:54:22 +00:00
diego ec0ba2f460 riff.h and avi.h are not needed, but avio.h is.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27616 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 15:30:06 +00:00
uau 4768e340ab Make internal Matroska demuxer default again
Undo Aurelien's previous commit which made the lavf demuxer the
default. SSA/ASS subtitles do not work properly with the lavf demuxer
at the moment. That's much more important than any issues with the
internal demuxer. The internal demuxer must remain the default at least
until the subtitle issues are resolved.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 14:45:50 +00:00
aurel 9500a8cc9c revert r27551 which break much more things than it fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 14:28:44 +00:00
uau a4b5780c2f Use internal demuxer for Matroska files for now
Change the default demuxer back to the internal one at least until the
current lavf breakage with SSA/ASS subtitles is sorted out. There have
also been quite a few other regressions so maybe the lavf demuxer
should be tested a bit more before trying to make it the default again.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27551 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 21:26:24 +00:00
uau 923f67082e Fix compilation after libavcodec major version 52 changes
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
 - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
 - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
 - Don't set AVCodecContext->rtp_mode (already marked unused before).
 - Use ff_eval2() instead of ff_eval().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 17:02:32 +00:00
aurel 237ae0ac8a lavf: the subtitles display duration is stored in pkt.convergence_duration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27525 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-04 23:34:27 +00:00
aurel 6c675482ff prefer libavformat to demux matroska files
I can't spot any regression anymore. If you find one, please tell me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 21:12:48 +00:00
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
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
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
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
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