Commit Graph

29797 Commits

Author SHA1 Message Date
reimar 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
reimar 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
reimar 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
reimar 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
attila 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
jrash 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
reimar 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
reimar 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
reimar 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
reimar 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
reimar 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
reimar 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
reimar 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
reimar 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
reynaldo 3efb64e34e So Long, and Thanks for All the Fish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29824 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 04:12:39 +00:00
cehoyos a10b3f08bf Add new VDPAU feature high-quality-scaling (and require newer library).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 15:30:13 +00:00
tack b6712cc6c2 reorder_ch: Remove unneeded AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_*
All references to these values were removed r29821.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29822 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 00:58:11 +00:00
tack b88d08040e ad_ffmpeg: Fix channel layout for ffvorbis and ffaac
Patch submitted by Nicolas George, nicolas.george normalesup org

The layout exceptions removed by this patch were rendered unnecessary by
changes in ffmpeg which normalize channel layout for aac (r20067) and vorbis
(r20148).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29821 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 00:54:46 +00:00
compn fe57d3e844 cosmetics: alphabetize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29820 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 23:54:32 +00:00
compn f4578bf655 10l for breaking compilation. change eatgv to tgv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29819 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 23:45:11 +00:00
reynaldo 11cc4bcadb Remove unneeded initialization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29818 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 20:46:54 +00:00
compn 47271a8598 add yuvs fourcc, fixes yuvs.mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29817 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 20:18:47 +00:00
compn 869aad500e add ffmpeg eatgv codec
patch by Jan Engelhardt jengelh ta medozas.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29816 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 20:03:37 +00:00
compn 76c5520d74 add audio format 0x55005354 to mp3, fixes unknown_audio_codec.avi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29815 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 19:45:43 +00:00
diego 4ccaa41db0 The "ilaced" suboption of vf_scale was renamed to "interlaced".
Fixes Bugzilla #1596.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29814 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 22:32:47 +00:00
cehoyos dbe7c02a78 Improve VDPAU noforce-mixer documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29813 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 16:42:37 +00:00
uau ce2300b437 demuxer.c: Add initialization missing from previous commit
Reimar's previous commit ("Unbreak the demuxer-specific code in
video.c with e.g.") added the new field "non_interleaved" in
demux_stream structs, but this field was not initialized anywhere.
Under suitable circumstances this could cause a "Too many
video/audio packets in the buffer" error and failing playback. Fix
the problem by cleaning up the code that creates new instances of the
struct. Now fields will be initialized to 0 by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29812 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 01:40:09 +00:00
compn b0d6753723 add VYUY and Y42B fourccs to rawcodecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29811 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 00:11:30 +00:00
reimar 1280614c9f Unbreak the demuxer-specific code in video.c with e.g.
-audiofile by moving the code to manually interleave
subtitles to mp_common.c.
video.c should still be changed to not be demuxer-specific
anymore, it is bad practice but fully fixing it is non-trivial.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29810 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-01 09:48:34 +00:00
cehoyos e9942166df Teletext display does support font scaling via OSD font scaling, remove
TODO item.

Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29809 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 15:34:18 +00:00
cehoyos 631d5f1f84 Replace two more occurences of tvi_vbi with dec_teletext.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29808 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 15:30:56 +00:00
cehoyos 91943aa9fa Remove incorrect comment.
Original patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29807 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 15:28:28 +00:00
jrash ffb717be28 sync with en/mplayer.1 r29805
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29806 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 02:00:00 +00:00
corey 0746f99a0a Slightly change behavior of "none" if fstype specification.
In a list of enabled fstypes, "none" now clears the list rather than
disabling all fstypes and interrupting the parser. To enable only one
(or more) fstypes, list the types to enable after "none".

For example:
"-fstype none" is the same as before: all disabled
"-fstype none,fullscreen" enables only the fullscreen type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 22:18:29 +00:00
stefano 9e259c79bd Document slice ordering assumption done by sws_scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29804 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 14:13:25 +00:00
cehoyos 88397d63f1 Support ISDB-Tb tunning in Brazil
Patch by Sérgio Fortier, sergiofortier A yahoo com br 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29803 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 10:03:54 +00:00
cehoyos 9df11ee8bf Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some paths
in comments.

Based on a patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:39:00 +00:00
cehoyos a9474b0b39 Move teletext specific code from stream into libmpcodecs.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
diego f86cab4ecc consistency fix: Give all CONFIG_ definitions the value 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29800 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-28 13:55:18 +00:00
cehoyos 7800998a95 Cosmetics: Reindent after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29799 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-27 08:29:07 +00:00
cehoyos 29c937fe80 Allow image format BGRA when using vo vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29798 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-27 08:28:08 +00:00
reimar 406c8a2b5b Move 64 bit check below compiler detection since it needs the compiler
and obviously should use the one that will be used for compiling in the end.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29797 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-26 22:15:19 +00:00
cehoyos 1198f65d0b Fix teletext character set auto-detection.
Patch by Francesco Lavra, francescolavra interfree it 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29796 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-24 13:19:20 +00:00
diego 3d264d7b55 Move some variable initializations to the beginning of vo_x11_fullscreen().
Fixes the warnings:
libvo/x11_common.c:1344: warning: 'h' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'w' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'y' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'x' may be used uninitialized in this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29795 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-24 12:35:18 +00:00
cehoyos fbf26ecb14 Implement VFCAP_FLIP for vo_vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29794 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-23 18:26:42 +00:00
cehoyos 4a8b396b31 Free memory allocated in ff_vdpau_add_data_chunk() on uninit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29793 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 18:44:39 +00:00
ptt a59c8e7d6a synced with r29791
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29792 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 15:40:04 +00:00
diego 9e9c609a36 Break an output line for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29791 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 14:19:10 +00:00
ptt 789ad059d1 cosmetic fixes in bs2b and vdpau sections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29790 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 14:06:38 +00:00
compn b2ebe30621 add V422, YUNV to rawyuy2
add UYNV,UYNY,uyv1,2Vu1 to rawuyvy
add P422 to raw422P

works on samples/V-codecs/.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29789 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-20 16:26:30 +00:00