Commit Graph

175 Commits

Author SHA1 Message Date
reimar 1698db0726 Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the
right arguments, and that code actually works in contrast to the one in demux_open_lavf.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:15:26 +00:00
reimar 25f0498660 Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
instead of incorrectly claiming that the demuxer does not support programs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29845 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:09:23 +00:00
reimar 1ad332f8a5 lavf: if seeking in the desired direction failed, also try in the opposite one,
otherwise we might end up at some random position (where lavf last ended
up while trying to build the index).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 08:19:49 +00:00
reimar 86ff541253 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
claims the Wave64 files but can not handle them).
Patch by Daniel Verkamp [daniel drv nu].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:30:02 +00:00
reimar cd5fa27550 Sort preferred_list alphabetically since the order does not matter otherwise.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:28:35 +00:00
reimar 873d120347 Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 21:45:36 +00:00
reimar 64c5127103 Fix an endless loop if all programs are empty.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29660 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:08:05 +00:00
reimar b05f2d0bdf Always register all streams from libavformat, not just those belonging to a program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29657 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 08:55:05 +00:00
vitor 9d99f5bd8d Add support for lavf vqf demuxer and lavc TwinVQ decoder.
Also make lavf the default demuxer for vqf.

Ok'ed by Compn on IRC.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 17:20:44 +00:00
cehoyos 74f6a6ba52 Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
it now can be used for both audio and video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 23:01:36 +00:00
cehoyos 361bdec7ed Use mp_wav_override_taglists for both audio and video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29590 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 22:51:52 +00:00
greg 14df605236 Use new libavformat metadata API.
Patch by Anton Khirnov <wyskas@gmail.com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29497 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 23:26:42 +00:00
reimar 7924781b04 AVStream.language is deprecated, switch to av_get_metadata instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:13:52 +00:00
reimar bc8b79a37d Move allocation to avoid a possible memleak if new_sh_audio fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29385 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:06:46 +00:00
reimar 6a434d676b Remove pointless stream count checks, new_sh_* already checks for that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29384 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:04:38 +00:00
reimar 00be4423da Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
can correctly display the languages of audio and subtitle tracks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29383 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 07:49:04 +00:00
reimar 29369f0c33 Add const where appropriate, also gets rid of a compiler warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29338 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:43:32 +00:00
reimar b3f4cd6c52 100l, do not read probe buffer if it will not be used because a format was forced.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29337 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:39:02 +00:00
reimar ea47ab2a9f In all demux_info_add calls change "name" to "title".
Currently "name" and "title" are both used at random, this makes it consistent.
"title" was chosen because it is less ambiguous and also the get_meta_title
slave mode command uses that (there is no get_meta_name command).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-30 13:18:57 +00:00
reimar b5fcf45f11 Increase probe buffer size to 32kB, this makes ac3 auto-detection far more reliable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 09:24:46 +00:00
cehoyos 83c523f9ea Fix compilation: s/ff_gcd/av_gcd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-17 11:29:36 +00:00
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