1135e23dfc
Free demuxer->teletext when closing the demuxer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29874 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 11:26:03 +00:00
bd82936f63
Set demuxer->teletext to NULL when closing the TV interface,
...
since analog teletext can not (yet) work without the TV interface.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29873 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 11:24:29 +00:00
78290719a6
100: Fix function parameters when calling create_vdp_decoder() from query_format().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29872 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:40:34 +00:00
88d80c2361
Cosmetics: Fix indentation after last commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29871 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:05:10 +00:00
3865c166c9
Fail in query_format() if a VDPAU decoder is not available.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29870 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:04:32 +00:00
7c774fd5ce
Add a default to switch(image_format), suppresses a warning after a future patch.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29869 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 09:52:43 +00:00
3c2afd6786
Add support for 8 channel audio.
...
Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we
fail gracefully.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29868 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 00:45:19 +00:00
1d30062395
Cosmetics: remove trailing whitespace from file.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29867 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 00:43:14 +00:00
a4434cf2d7
Properly free the pthread mutex for teletext.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29866 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:37:15 +00:00
263e4a1144
Allow teletext compilation without pthreads
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29865 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:34:55 +00:00
4b55351e28
Fix compilation of teletext code without freetype support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29864 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:17:06 +00:00
509475ec2c
Change type of teletext color specification from unsigned char
...
to static const uint8_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:11:54 +00:00
7f8d660be5
Make sure the teletext property stuff does not crash if no demuxer is available.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29862 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:04:57 +00:00
87a4e870b7
The code for the non-networking case is the same whether networking
...
support was enabled or no, so avoid duplicating it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29861 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 14:12:14 +00:00
0d782226c1
Factor out triplicated break statement.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29860 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 14:08:35 +00:00
a144a22453
Remove unused mp_dvdnav_aid_from_audio_num function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29859 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 10:29:15 +00:00
2dfd5e5f53
Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
...
dvdnav_get_spu_logical_stream both take the same numbering (i.e.
not the ids used in the MPEG-TS).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29858 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 10:27:48 +00:00
bc1ee4ca03
Use enum PixelFormat instead of int for srcFormat and dstFormat.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29857 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 23:31:43 +00:00
3cc24f5bee
Remove macho64 special-case for yasm options, -DPIC is already added
...
by the PIC-detection code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29856 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 19:32:57 +00:00
4c3dc1b10b
Remove a pointless undeclared function reference, #error is assumed
...
to be enough to fail cc_check all over the place already.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29855 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:41:40 +00:00
2ccdd44e84
Add a comment that the PIC handling in mangle.h is duplicate also in
...
configure and libavutil and fixes to one should be applied to the others, too.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29854 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:39:54 +00:00
e1ce8f9c41
Add a check if compiler creates PIC code and if so add -DPIC to YASMFLAGS.
...
Should make it possible to compile MPlayer as PIE on x86_64 e.g. on
hardened Gentoo and probably OpenBSD, too.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29853 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:38:59 +00:00
cc807663bf
Clarify possible issues with gmplayer commandline options due to conflicts
...
with separate gui configuration file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29852 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:01:05 +00:00
2a5611473c
Remove CONFIG_TV_TELETEXT.
...
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
241164f72c
Factorise vbi_decode().
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29850 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 13:09:24 +00:00
419e4f684a
Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:55:07 +00:00
423c415534
Separate teletext from tv support.
...
Path by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00
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
36a0a35598
Use switch_program property from mplayer.c to set ts_prog.
...
This seems to leave the ts demuxer unaffected, but fixes -tsprog with
the lavf demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29846 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:12:56 +00:00
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
3591832515
Document sws_freeContext().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29844 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 09:23:11 +00:00
b963af59f1
Whitespace cosmetics: reindent reinit_audio_chain function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29843 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:16:22 +00:00
89c9b3b769
Remove some useless comments/commented-out code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29842 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:11:58 +00:00
477057dbb5
Split assignment from error value check to avoid overcomplicated if () condition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29841 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:10:19 +00:00
e83addcbfa
Reuse the init_error exit path also for init_best_audio_codec errors.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29840 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:08:00 +00:00
bf80f35958
Simplify: use &= instead of a = b & a;
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29839 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:06:33 +00:00
9edfe2046e
Remove some unnecessary else blocks
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29838 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 16:04:39 +00:00
f4926132f8
Use an early return instead of a {} block over the whole function in reinit_audio_chain
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29837 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 15:59:42 +00:00
fefbdf991b
Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
...
decoder is used but the hardware does not support hardware MPEG audio).
Otherwise this will lead to a crash later on when the decode code tries to access
the audio filter chain.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29836 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 15:56:30 +00:00
c6b1e6880b
Only call avcodec_close if the open succeeded before, otherwise avcodec_close
...
will crash (happens e.g. when encoding ends before any frames were actually encoded,
e.g. when an MPEG file was cut down to much so it no longer contains a full video frame).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29835 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 15:45:55 +00:00
87e2b02f7a
PPC: make inline asm xform address test work with Apple tools
...
original from mru, ffmpeg commit r20466
adapted to mplayer by Emanuele Giaquinta (exg)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29834 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 14:06:58 +00:00
cc057549fb
sync with en/mplayer.1 r29823
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29833 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 12:30:56 +00:00
ef479d9d01
dvdnav: print ID_SID_..._LANG, just like dvd://
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29832 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:29:14 +00:00
c76ea256de
Cosmetics: indentation, merge two consecutive ifs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29831 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:27:25 +00:00
503fe2eb9c
Make dvdnav also print info about audio streams with unknown language, just like dvd://
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29830 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:26:23 +00:00
b00d649d98
Make the dvdnav stream language information output more similar to the dvd one.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29829 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:22:38 +00:00
f46ede9a6b
Change the subtitle numbers in the dvdnav subtitle language info to match
...
the numbers used by MPlayer's OSD and -sid option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29828 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:13:38 +00:00
7566e72f77
Change dvdnav_reset_stream to not disable subtitles, since that breaks
...
selecting the subtitle via -slang or -sid.
It is quite possible that removing it will cause other issues, though
I could not see any with the DVDs I had available for testing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29827 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 20:59:46 +00:00
9c0834b0f6
Add cast to signed for 64 bit check, since according to an FFmpeg bug report
...
some compilers (llvm?) do not fail when arrays larger than the maximum
addressable size are declared but instead just silently generate broken code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29826 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 19:05:42 +00:00
4532c8ad2f
Add a profile example and (commented-out) useful defaults for dvdnav
...
to example.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29825 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 18:53:05 +00:00
reimar
cehoyos
tack
stefano
attila
jrash