summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stream: add new stream control command STREAM_CTRL_GET_NUM_TITLESmplayer-svn2012-08-037-0/+28
| | | | | | | | | This provides the total number of titles (aka tracks) of CDs / VCDs / DVDs. Additionally, add a titles property to the get_property slave command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34474 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: ib
* cache2: flush cache and sync stream position/eof after seeking STREAM_CTRLsmplayer-svn2012-08-031-10/+33
| | | | | | | | | | | | | | | | | | | | This avoid some strange differences in behaviour between -cache and -nocache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34461 b3059339-0415-0410-9bf9-f77b7e298cf2 cache2: fix seeking with e.g. flv files This is a regression that was introduced in r34461. Found and bisected by Anssi Hannula [anssi.hannula iki fi]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34575 b3059339-0415-0410-9bf9-f77b7e298cf2 cache2: print an error when streams behave in a way that the cache cannot handle git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34576 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* stream/http: add a test file for ultravox in commentmplayer-svn2012-08-031-0/+3
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34431 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* cache2: make cache process exit when main process diesmplayer-svn2012-08-031-0/+13
| | | | | | | | Make cache process detect when the main process disappeared and make it exit on its own in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34371 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vo_caca: reformat and various fixesmplayer-svn2012-08-031-174/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits by various authors. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34337 b3059339-0415-0410-9bf9-f77b7e298cf2 vo_caca: Port to libcaca 1.x API, which is widespread enough nowadays. patch by Paul B. Mahol, onemda gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34338 b3059339-0415-0410-9bf9-f77b7e298cf2 caca: support mouse events and more keys. Patch by Paul B. Mahol [onemda gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34359 b3059339-0415-0410-9bf9-f77b7e298cf2 caca: for ordinary keys, send key events on press instead of release. This is consistent with how other vos behave. Patch by Paul B. Mahol [onemda gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34360 b3059339-0415-0410-9bf9-f77b7e298cf2 caca: process all pending events instead of exactly one per check_events. Patch by Paul B. Mahol [onemda gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34361 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34362 b3059339-0415-0410-9bf9-f77b7e298cf2 Use lookup_keymap_table instead of a large number of switch cases. Patch by Paul B. Mahol [onemda gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34363 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: diego
* vf_expand: add sanity checksmplayer-svn2012-08-031-1/+20
| | | | | | | | | | Make vf expand more picky: refuse operating on compressed or hwaccel formats and fix up offsets that would cause color corruption for YUV formats with downsampled chroma. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34356 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* mp_image: set chroma_x_shift for 1-plane YUV formatsmplayer-svn2012-08-031-0/+1
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34355 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* af: some spelling/grammar fixesmplayer-svn2012-08-031-3/+3
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34349 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* af_lavcac3enc: remove pointless castsmplayer-svn2012-08-031-5/+5
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34348 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* demux_audio: improve WAV format detectionmplayer-svn2012-08-031-1/+3
| | | | | | | | Make WAV format detection more restrictive so it does not incorrectly grab qcp files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34343 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* af: fix crash on invalid channel countmplayer-svn2012-08-031-0/+4
| | | | | | | | | | Sanitize channel count for libaf to avoid crashes since it is used unchecked. af_downmix is an example of a function that can/will crash for invalid values. 0 is not invalid since it is used as "autodetect" for output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34342 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vo_md5sum: support printing to stdoutmplayer-svn2012-08-031-1/+4
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34313 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* demux_audo: fix wrong runtime and average bitrate for VBR MP3mplayer-svn2012-08-031-1/+67
| | | | | | | | | Do so by determining the number of frames from the Xing/Info/VBRI headers and by calculation a correct duration which leads to an reasonable average bytes per seconds. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34273 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: ib
* demux_audio: ensure that demuxer->movi_end will be setmplayer-svn2012-08-031-3/+2
| | | | | | | This also simplifies the code that checks for TAG. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34272 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: ib
* osdep:/glob-win.c: reformatmplayer-svn2012-08-031-55/+47
| | | | | | | Use uncrustify on glob-win.c to fix the indentation mess in it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34239 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* configure: add -D__STDC_FORMAT_MACROS to CXXFLAGSmplayer-svn2012-08-031-1/+1
| | | | | | | This is required to safely #include inttypes.h in .cpp files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34231 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: diego
* Replace 'q' printf length modifier by 'll'mplayer-svn2012-08-032-3/+3
| | | | | | | 'q' is just a deprecated synonym of 'll' that should no longer be used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34224 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: diego
* libmpcodecs: add ad_spdif.c, S/PDIF passthrough decodermplayer-svn2012-08-037-4/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Naoya OYAMA, naoya.oyama gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34191 b3059339-0415-0410-9bf9-f77b7e298cf2 fix ad_spdif Call av_register_all() before initialising the SPDIF muxer. Fixes playback with -demuxer mpegts -ac spdifac3. Patch by Naoya OYAMA, naoya D oyama gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34291 b3059339-0415-0410-9bf9-f77b7e298cf2 Use new API avformat_new_stream() instead of the deprecated av_new_stream(). Patch by Naoya OYAMA, naoya D oyama gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34292 b3059339-0415-0410-9bf9-f77b7e298cf2 Cosmetics: Remove empty statement. Patch by Naoya OYAMA, naoya D oyama gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34293 b3059339-0415-0410-9bf9-f77b7e298cf2 Use init_avformat() instead of av_register_all(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34294 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: diego
* configure: drop extra standard compiler/linker flags for *BSD systemsmplayer-svn2012-08-031-9/+0
| | | | | | | | Adding the standard library locations to the search path is doubtful behavior and unnecessary at least on FreeBSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34128 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: diego
* x11: change stop_xscreensaver default to 1 to be more user-friendlymplayer-svn2012-08-032-3/+4
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34076 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* x11: make the stop-xscreensaver option behave as described in the man pagemplayer-svn2012-08-031-1/+1
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34074 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* subreader: fix reading of aqr/subrip09 subtitlesmplayer-svn2012-08-031-8/+8
| | | | | | | | | NULL return would indicate EOF, thus the "clear subtitle" entries would cause sub file parsing to stop. In addition the wrong sub end times would be used with CONFIG_SORTSUB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33993 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* subreader: get rid of some code duplicationmplayer-svn2012-08-031-64/+34
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33992 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* Remove leftover BeOS support stuffwm42012-08-035-63/+0
| | | | As by mplayer-svn commit 33972. Their BeOS removal was more thorough.
* cache2: make warnings easier to understandmplayer-svn2012-08-031-2/+2
| | | | | | | | | | | | Mark two warnings that usually only indicate a performance issue as such. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33955 b3059339-0415-0410-9bf9-f77b7e298cf2 Another attempt to make message easier to understand. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33956 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vo_null: do not accept hwaccel formatsmplayer-svn2012-08-031-0/+2
| | | | | | | | Do not accept hwaccel formats since they need special vo support and thus will actually not work with it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33953 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* configure: drop check for -lposix4wm42012-08-031-10/+0
| | | | | This was needed for ancient Solaris systems. mplayer-svn dropped this check in r33892.
* vf_stereo3d.c: half-width side-by-side formats for stereo3dmplayer-svn2012-08-032-0/+24
| | | | | | | | | Half-width side-by-side formats for stereo3d. Patch by Steaphan Greene [sgreene cs.binghamton.edu] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33877 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* loader: remove weird kstat thingwm42012-08-032-60/+0
| | | | | Apparently the win32 binary codec loader used this to retrieve the CPU frequency on Solaris.
* configure: remove some unused checkswm42012-08-031-71/+0
|
* Remove teletext supportwm42012-08-0322-2410/+19
| | | | | | | | Teletext requires special OSD support. Because I can't even test teletext, I can't restore support for it. Since teletext can be considered ancient and obscure, and since it doesn't make sense to keep the remaining teletext code without being able to use it, I'm removing it.
* stream: remove V4L TV input and V4L radio supportwm42012-08-026-2127/+7
| | | | There are V4L2 drivers, and the old V4L stuff seems plain unnecessary.
* mplayer: rip out --capture supportwm42012-08-029-81/+0
| | | | | | | While this was an interesting idea, it wasn't actually useful. Basically it dumped the raw data (as requested by the demuxer) into a file. The result is only useful if the file format was raw or maybe some MPEG packet stream, but not with most modern file formats.
* VO: remove VO direct renderingwm42012-08-0212-163/+3
| | | | | | | | | | | | | | | | | | | This was disabled by default, and could be enabled with -dr. It was disabled by default because it was buggy: there were issues with OSD corruption. It wasn't entirely sane for OpenGL based VOs either. OpenGL can chose to drop mapped pixel buffer objects, requiring the application to map and fill the buffer again. But there was no mechanism in mplayer to fill the lost buffer again. (It seems this rarely happened in practice, though.) On the other side, users liked the --dr flag, because it promised them more speed. I'm not sure if it actually helped with speed, but it's unlikely it had any real advantages on modern systems. In order to evade the --dr cargo culting in mplayer config files, it's best to get rid of it.
* stream: remove stream_cuewm42012-08-024-645/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | stream_cue, which provided the cue:// protocol handler, was extremely hacky and didn't even manage to play some samples I tried. Remove it, because it's plain unneeded. There is much better support for .cue files elsewhere: - libcdio can play pairs of .cue/.bin files: mplayer cdda:// --cdrom-device=your_cue_file.cue Note that if the .cue file is not accompanied by a .cue file, but an encoded file for example, this most likely won't work. - mplayer can play .cue files directly: mplayer your_cue_file.cue This works, even if the .cue file comes with encoded files that are not .bin . Note that if you play .bin files, mplayer will assume a specific raw audio format. If the format doesn't match, mplayer will play noise and destroy your speakers. Note that format mismatches are extremely common, because the endianness seems to be essentially random. (libcdio uses a clever algorithm to detect the endian, and doesn't have this problem.)
* AF: remove af_gate and af_compwm42012-08-025-347/+0
| | | | | | | To quote the manpage: "This filter is untested, maybe even unusable." And it seems they were never touched again after it was added many years ago (except for cosmetic changes). Just get rid of them.
* Revert "codecs: prefer libmad over libmpg123"wm42012-08-021-12/+12
| | | | | | | | This reverts commit c8b0f2115447f2fdd5bb8090d06153a4bf72d9ff. This was a very bad idea. It caused A/V desync with some crappy AVI files, and upon inspecting ad_mad.c, it seems all hope is lost. Go back to the prefering the mpg123 & libav codecs.
* man: update man with vo_corevideo and vo_sharedbufferStefano Pigozzi2012-08-021-14/+16
| | | | | Conflicts: DOCS/man/en/vo.rst
* man: update documentation related to screenshotswm42012-08-023-16/+97
|
* man: remove documentation for deleted stuffwm42012-08-024-448/+38
| | | | Also make some minor cosmetic changes.
* manpage: merge new manpagewm42012-08-029-3/+6107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About a year ago, ubitux converted most of the old manpage from the hard to maintain nroff format to reStructuredText. This was not merged back into the master repository immediately. The argument was that the new manpage still required work to be done. However, progress was very slow. Even worse: the old manpage wasn't updated, because it was scheduled for deletion, and updating it would have meant useless work. Now the situation is that the new manpage still isn't finished, and the old manpage is grossly out of sync with the player. This is not helpful for users. Additionally, keeping the new manpage in a separate branch, while the normal development repository for code had the old manpage, was very inconvenient, because you couldn't just update the documentation in the same commit as the code. Even though the new manpage isn't finished yet, merging it now seems to be the best course of action. Squash-merge the manpage development branch [1], revision e89f5dd3f2, which branches from the mplayer2 master branch after revision 159102e0cb. Committers: * Clément Bœsch <ubitux@gmail.com> (Initial conversion to RST.) * Uoti Urpala <uau@mplayer2.org> (Many updates.) * Myself (Minor edits.) Most text of the manpage has been directly taken from the old manpage, because this is a conversion, not a complete rewrite. [1] http://git.mplayer2.org/uau/mplayer2.git/log/?h=man
* vf: remove VFCAP_FLIPPED and VFCAP_CONSTANTwm42012-08-023-18/+1
| | | | These were unused.
* mplayer: expand --title as property, remove --use-filename-titlewm42012-08-025-9/+17
| | | | | | | | | The --title option, which sets the GUI window caption, is now expanded as slave mode property string (like osd_show_property_text). Make the default value for --title include the filename. This makes a behavior similar to --use-filename-title the default. Remove the --use-filename-title option, as it's redundant now.
* m_config: reallow specifying static default values for string optionswm42012-08-021-1/+1
| | | | | | | | | | | | Commit dc2a4863af9b0e introduced a new way of specifying default values for strings (you're supposed to use OPTDEF_STR() instead of putting it into the option struct, such as it was done in defaultopts.c). The code to handle the old way was explicitly disabled, which caused random crashes when used. Allow the old way again. With the main option struct in particular, I see no reason why some option defaults should be specified in defaultopts.c, and some directly along the options.
* cpudetect: remove unused/forgotten crapwm42012-08-012-14/+0
|
* input: change bind_keys() to use bstrwm42012-08-011-16/+14
| | | | | This seems rather pointless considering there are still stupid bstrdup0()s left, but maybe this is the right direction.
* Makefile: move commands from distclean to clean and add missing fileswm42012-08-011-3/+8
| | | | | | | | | | | There is no reason why generated source files shouldn't be part of the clean target, as opposed to distclean. On the contrary, having them in distclean only looks dangerous when trying to deal with broken dependency rules. Move them to clean, except config.h (which would require configure to be run again). Also, some recently added generated files were missing from the clean targets.
* build: remove references to cpuinfowm42012-08-014-369/+0
| | | | | | | This was a horrible little tool to detect the host CPU at build time. Forgotten in commit 74df1d8e05aa226c7e8. Also remove forgotten codec-cfg entry in .gitignore .
* input: replace internal key binds with included etc/input.confwm42012-08-013-159/+15
| | | | | | | | | | | The internal array of default key bindings is removed. Include the file etc/input.conf at compile time (using the file2header tool), and parse the default binds from etc/input.conf at startup time. This lowers maintainance overhead, and makes sure the default bindings and etc/input.conf don't deviate. Commit f30bf73bf22ed0542 already made sure etc/input.conf matches the default bindings, so this commit shouldn't change anything user-visible.
* input: refactor: store builtin key binds along user user bindswm42012-08-011-24/+26
| | | | | Builtin (i.e. default) binds are still separately handled, and this commit shouldn't change any user-visible behavior.
* input: simplify input.conf parsingwm42012-08-011-72/+28
| | | | | | | | | Now input.conf is loaded into memory at once, instead of streaming the file into the parser. The real reason for this change is that I want to be able to read the config file from memory. (Using fmemopen() would have been simpler, but that is available on sane platforms only.)
* osd: minor simplification of vo_osd_changed()wm42012-08-017-29/+30
| | | | | | | | | | | | | | | | | | vo_osd_changed() was a weird function: it was used both to query and mutate state, which is a bad combination. The VOs used it to query and reset the state, and the mplayer frontend mostly used it to set the state. In some cases, the frontend did both (that code used a variable "int hack" to backup the state and set it again). Simplify it and make the VOs use a vo_osd_has_changed() function to query whether the OSD bitmaps have to be recreated. vo_osd_changed() on the other hand is now used to update state only. The OSD change state is reset when osd_draw_text() is called. Update vo_corevideo.m to use vo_osd_resized() as well (forgotten change from libass-OSD merge). Simplify osd_set_text() and its usages.
* stream: remove native RTSP/RTP/PNM supportwm42012-08-0133-10405/+7
| | | | | | There are still various other RTSP implementations available, such as libnemesi, live555, and libav. The mplayer native version was a huge chunk of old unmaintained code.
* Remove dead codewm42012-08-0145-2825/+0
| | | | | | | | | | | | | This was done with the help of callcatcher [1]. Only functions which are statically known to be unused are removed. Some unused functions are not removed yet, because they might be needed in the near future (such as open_output_stream for the encode branch). There is one user visible change: the --subcc option did nothing, and is removed with this commit. [1] http://www.skynet.ie/~caolan/Packages/callcatcher.html
* gitignore: add osd_font autogenerated fileStefano Pigozzi2012-08-011-0/+1
|
* mangle: change preprocessor define for macosxStefano Pigozzi2012-08-011-1/+1
| | | | __DARWIN is still not defined, use __APPLE__ instead
* vo_corevideo: remove font_load codeStefano Pigozzi2012-08-011-2/+0
| | | | | This was probably forgotten in the commit that removed the dependency on freetype.
* vo_gl3: support changing cmdlinewm42012-08-011-2/+82
|
* VO: add mechanisms to change VO commandline for VOs supporting itwm42012-08-014-0/+20
|
* mplayer: remove pos parameter from sadd* functionswm42012-08-011-53/+46