aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* codecs.conf: Add FourCC ai12 for AVC Intra 100 / 1080.Gravatar cehoyos2011-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33061 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_liba52: Fix -ac a52 with tags other than 0x2000 or dnetGravatar reimar2011-04-13
| | | | | | | Audio with all codec tags other than 0x2000 was byte-swapped, while only "dnet" should be. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33028 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio: do not run the AC-3 parser on byte-swapped AC-3Gravatar reimar2011-04-13
| | | | | | | | | Libavcodec has no parser that would work on byte-swapped AC3, but at least don't run the normal AC-3 one which would only break things. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33026 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33027 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: print correct result variable for armv6t2 testGravatar reimar2011-04-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32996 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists.c: add LXF PCM and dvvideoGravatar cehoyos2011-04-12
| | | | | | | | | | Support audio in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32990 b3059339-0415-0410-9bf9-f77b7e298cf2 Support dvvideo in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32991 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvdnav: identify: show more title informationGravatar cehoyos2011-04-12
| | | | | | | | | Add ID_DVD_TITLE_x_CHAPTERS and ID_DVD_CURRENT_TITLE to the output of dvdnav:// -identify. Patch by Mike Castle, dalgoda+mplayer A gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32982 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream: try to reset stream once if read failsGravatar reimar2011-04-12
| | | | | | | | | | | | | | | | | | | | | When reading from a stream fails, try one more time after a reset. This should re-establish for example timed-out network connections. Fixes bug #1841. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32954 b3059339-0415-0410-9bf9-f77b7e298cf2 100l, fix incorrect len when retrying read. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32957 b3059339-0415-0410-9bf9-f77b7e298cf2 Improve stream reset on read error, should now fix bug #1841 in more cases, e.g. also with -cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32977 b3059339-0415-0410-9bf9-f77b7e298cf2 Add ugly hack to compensate DVDNAV's ugly hacks and fix seeking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33122 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add ai5q and ai1q fourccs for h264 decodersGravatar compn2011-04-12
| | | | | | ported from ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32948 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvdnav: don't skip last title for dvdnav:// -identifyGravatar cehoyos2011-04-12
| | | | | | Patch by Mike Castle, dalgoda+mplayer gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32944 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: fix "gamma" equalizer settingGravatar reimar2011-04-12
| | | | | | | The "gamma" setting only changed red gamma. Fix it to change all of red, green and blue gamma. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32895 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: clarify XAN DPCM commentGravatar cehoyos2011-04-12
| | | | | | | | | At least for Wing Commander 4 files, -demuxer lavf is needed to play XAN DPCM audio (while Wing Commander 3 avi plays fine with -demuxer avi, although it also contains the video codec we call "XAN wc4"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32894 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Support 0x594A as format value for XAN DPCM audioGravatar cehoyos2011-04-12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32885 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream: Make stream_write_buffer() check for short writesGravatar ranma2011-04-12
| | | | | | | | | | | | | | | | | | | | None of the calling sites to stream_write_buffer were checking the return value to see if all bytes got written (nothing in current code actually calls it any more after MEncoder was removed). This was causing (very occasionally) problems with mencoder when using output pipes AND running under a sandbox or when being straced (ptrace is the culprit). Theoretically this problem can happen without pipes or ptrace. Only stream_file, stream_smb and stream_ffmpeg implement write_buffer and ffmpeg already handles this internally. Original patch by Sang-Uok Kum. Signed-off-by: Tobias Diedrich <ranma@google.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32881 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD: support displaying fractional part of current positionGravatar Uoti Urpala2011-04-12
| | | | | | | | Add option -osd-fractions which enables display of fractional seconds when showing the current playback time on OSD. Based on a patch from Christian <herr.mitterlehner@gsmpaaiml.com> but with several modifications.
* demux_lavf: disable support for byte-based seekingGravatar Uoti Urpala2011-04-08
| | | | | | | | | | | | libavformat returns nonsense per-stream bitrate values for some MPEG files (0 or many times higher than the overall bitrate of the file), which triggered the heuristic to enable byte-based seeking in demux_lavf and then made the byte-based seeks wildly inaccurate. Disable the support for byte-based seeks. This will avoid problems with files that have consistent timestamps, but on the other hand will completely break seeking in MPEG files that have timestamp resets. I'll probably add at least an option to manually enable byte-based seeking later.
* demux_mkv: support runtime video track switchingGravatar Uoti Urpala2011-04-08
| | | | | | | Add code identical to the audio case to also support switching video tracks at runtime. Patch by "Hermi".
* VO: don't wait for map event in X VO initializationGravatar Uoti Urpala2011-04-08
| | | | | | | | | | | After creating a video window the common X code waited for a MapNotify event before proceeding. This meant that if the window was opened on another workspace the player would be stuck until the user switched to that workspace and the window could become actually visible. Remove this waiting code. I don't know why it was there or if it was actually beneficial/needed for some setup (at least common uses seem to work fine without it); it comes from the earliest MPlayer versions visible in VCS history.
* TOOLS/matroska.py: recognize CodecNameGravatar Uoti Urpala2011-04-08
|
* demux_mkv, demux_lavf: don't select initial audio trackGravatar Uoti Urpala2011-04-02
| | | | | | | | | | | | | Remove code that tries to select audio track during demuxer initialization from demux_mkv and demux_lavf. Just leave audio disabled at that point; the higher-level select_audio() function will call the demuxer to switch track later anyway. Removing this unneeded code also fixes use of these demuxers as the main demuxer with -audiofile. Before the automatic track selection would have enabled an audio track (if the file had any); as the main demuxer was not used for audio the unused packets from this enabled track would accumulate until they reached queue size limits.
* core: do proper audio track selection for -audiofile demuxerGravatar Uoti Urpala2011-04-02
| | | | | | | The select_audio() call was done on the main demuxer, not -audiofile one (the "if (mpctx->num_sources)" test in the previous code was always true). Call it on the -audiofile demuxer instead. The -audiofile stuff still needs a proper cleanup later though.
* configure: remove old GUI-related optionsGravatar Uoti Urpala2011-04-02
| | | | | | | | Remove --with-glib-config, --with-gtk-config, --enable-gui, --disable-gui, --enable-gtk1, --disable-gtk1. The only one of these that still had any effect was --enable-gui which printed a warning about GUI removal and exited. The --with options were still shown in help output, the rest had already been deleted from that.
* demux_mkv: fix uninitialized variableGravatar Uoti Urpala2011-04-02
| | | | | | Commit de42015a97cf296aad6307 ("demux_mkv: read tags") added code that failed to initialize a loop variable. Fix. No visible problems caused by the bug have been reported.
* mp3lib: drop internal mp3lib treeGravatar Uoti Urpala2011-04-02
| | | | | | | | | | | | | Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
* af_lavcac3enc: fix channel reorderingGravatar Uoti Urpala2011-03-31
| | | | | | Reordering to libavcodec channel order was broken with libavcodec versions using float input to the ac3 encoder because the reordering code still assumed int16 sample size. Fix.
* demux_mkv: support Blu-ray subtitlesGravatar Uoti Urpala2011-03-31
| | | | Recognize "S_HDMV/PGS" CodecID.
* demux_mkv: simplify subtitle type recognitionGravatar Uoti Urpala2011-03-31
| | | | | Remove indirection through MATROSKA_SUBTYPE_* and instead set the per-track type field to the letter identifier used in public sh_sub.
* demux_mkv: use generic packet handling code for subtitlesGravatar Uoti Urpala2011-03-31
| | | | | | | | Duration may now be set for packet types other than subtitles; as far as I can tell nothing should care. A check requiring valid duration values for subtitles is removed, because duration may not be properly set for all bitmap subtitle types; hopefully this doesn't make the behavior with (already broken) subtitles without duration worse.
* demux_mkv: support E-AC-3 audioGravatar Uoti Urpala2011-03-31
| | | | Recognize "A_EAC3" CodecID.
* demux_lavf: fix initial "-vid"-based video selectionGravatar Uoti Urpala2011-03-31
| | | | | | In 59058b54a73809866476b243d8bee82174fb4de8 (from svn r31129) Aurelien changed demux_lavf -vid indexing, but failed to change the initial video stream selection based on -vid to match. Fix.
* demux_lavf: fix stream switch returned index for no sound/videoGravatar Uoti Urpala2011-03-31
| | | | | | | | If the argument given to demux_lavf audio/video switch code is not one of -2, -1, or valid audio/video ID the code will treat it the same as -2 (switch to no sound / no video). However the returned index was not set to -2 in this case. Fix. Also change the returned index from -1 to -2 when staying at no sound / video.
* core, demux: fix video index handling in stream switchingGravatar Uoti Urpala2011-03-31
| | | | | | | | Fix bugs in the handling of stream index values in video stream switching. This is similar to what commit 90bedd0b872b6eea02351aafb62e did for audio. Also clean up the corresponding audio code a little bit.
* configure, Windows: support static pthreads on WindowsGravatar Diogo Franco2011-03-30
| | | | | | Windows pthreads requires certain functions to be called to initialize itself. It can do that through DllMain but no such luck when linked statically; mplayer needs to call the initialization explicitly.
* vd_ffmpeg: fix thread count setting with latest ffmpeg-mtGravatar Uoti Urpala2011-03-29
| | | | | | | | Recent ffmpeg-mt versions changed the API for setting the number of decoding threads to use (I'm not sure whether dropping backwards compatibility was intentional or not). As a result only one thread was used. Make the thread setting compatible with the new API to restore proper multithreaded decoding.
* vo_mga, build: change include from "libavcore" to "libavutil"Gravatar Uoti Urpala2011-03-28
| | | | | | | | | Libavcore was merged back to libavutil. Change the mga_template.c include of libavcore/imgutils.h to match. This means that split libavcore/libavutil versions won't work any more; but since this only affects people who enable vo_mga and there was no released version using the split libs I won't bother with any conditionals for the include.
* Copyright, LICENSE: change binary license to GPL 3Gravatar Uoti Urpala2011-03-24
| | | | | | | Change license indicated for compiled binaries to GPL 3 to match talloc.c which is LGPL 3+. Note that at least for now the source licenses have NOT been changed - almost everything is still GPL 2+ or compatible, not GPL 3+.
* demux_ty: disable -subcc functionality (demux_ty_osd)Gravatar Uoti Urpala2011-03-24
| | | | | | | | Disable compilation of demux_ty_osd.c because of its GPL v2-only license. This only affects TiVo files with -subcc. After this no v2-only code should get compiled (yuv4mpeg_intern.h has a v2-only license, but the contents of the header look like they're not copyrightable).
* vo_corevideo: add key_modifier_alt only when pressing left option keyGravatar Stefano Pigozzi2011-03-18
|
* .gitignore: add /cpuinfoGravatar Uoti Urpala2011-03-13
| | | | | Ignore the "cpuinfo" binary. The configure script can create that on systems which lack /proc/cpuinfo or equivalent.
* vo_corevideo: fix menubar showing 2 apples on snow leopardGravatar Stefano Pigozzi2011-03-11
|
* vo_corevideo: support modifier keys in keyboard inputGravatar Stefano Pigozzi2011-03-03
|
* core: hr-seek: fix soft hang with hrseek past EOFGravatar Uoti Urpala2011-03-03
| | | | | | | | | | | | | | | | When doing a precise seek video_out->frame_loaded was left to true while frames were being skipped. However vo_get_buffered_frame() always returns success if a frame is already loaded; due to this the EOF detection in update_video() never triggered, and a hr-seek past EOF could cause a soft hang (commands were still processed and it was possible to seek again to exit the loop). This could also happen with Matroska files using ordered chapters if an underlying file was actually shorter than the chapter that was supposed to come from it. Then seeking to a timestamp after the end of the file but before the end of the chapter would trigger the bug. Fix the problem by setting frame_loaded to false when we decide to skip the frame in question.
* configure: remove --ffmpeg-source-dir help outputGravatar Uoti Urpala2011-03-01
| | | | | | | | As things currently are the --ffmpeg-source-dir option will cause a compilation failure. Maybe the video filters that depend on internal FFmpeg headers to work should be deleted completely; for now I'll remove the option from the help output as it can only confuse normal users.
* libdvdcss: drop internal libdvdcss treeGravatar Uoti Urpala2011-03-01
| | | | | | | | | The internal libdvdcss version was only compiled if you used internal libdvdread too; and libdvdread was not included in the sources, so that'd only happen if you manually added libdvdread in the build tree. Keeping libdvdcss for that case probably isn't worth it, so delete it from the tree. The build system part is still there, so an internal build is possible if you add the directory back.
* build: change version number generationGravatar Uoti Urpala2011-02-19
| | | | | | | Force Makefile to always run version.sh to potentially regenerate version.h. Drop compiler version and 'git-' prefix from version number. Match only git tags starting 'v'+number when generating version number; leave the 'v' out from the result.
* configure: fix --enable-libvorbis with tremor installedGravatar Uoti Urpala2011-02-18
| | | | | | Autodetected libvorbis prevented tremor test from running, but --enable-libvorbis didn't. Add an explicit check to disable tremor in that case.
* .gitignore: add /po and /localeGravatar Uoti Urpala2011-02-15
|
* terminal output: change program name to "MPlayer2"Gravatar Uoti Urpala2011-02-15
|
* codecs.conf: Add FFmpeg WC4 xan decoderGravatar cehoyos2011-02-15
| | | | | | Patch by Philip Langdale, philipl overt org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32875 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: change DVB SPU format for libavcodecGravatar reimar2011-02-15
| | | | | | | | Change DVB SPU stream format in TS demuxer so it can be decoded by libavcodec (as soon as lavc is fixed not to fail just because of an extra padding byte). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32866 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: Print a message when lavc subtitle decoding failsGravatar reimar2011-02-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32865 b3059339-0415-0410-9bf9-f77b7e298cf2