summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move global mconfig to mpctxUoti Urpala2008-04-2617-68/+89
| | | | | | | | | | | The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code.
* options: Fix multiple -v by simplifying CONF_TYPE_FUNCUoti Urpala2008-04-261-5/+0
| | | | | | | | | | | | | The CONF_TYPE_FUNC implementation counted how many times the option had appeared and called the function that many times when it was set. However each -v on the command line triggered an increase of the count _and_ as many calls as the current count indicated. Thus the resulting verbosity levels for 0 to 5 -v were really 0, 1, 3, 6, 10, 15 instead of 0, 1, 2, 3, 4, 5. Remove the counting functionality and just call the given function once at each set operation. This fixes -v; other options are not affected.
* options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM]Uoti Urpala2008-04-261-3/+0
| | | | | | The "reset to default before setting to something else" functionality is not used by any current option, but prevents using the "priv" field of the option data for anything else.
* Merge svn changes up to r26540Uoti Urpala2008-04-2630-468/+421
|\ | | | | | | | | | | Conflicts: Makefile
| * Revert accidentally committed changes.diego2008-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26540 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add loader to parts if WIN32DLL is enabled.diego2008-04-252-2/+2
| | | | | | | | | | | | | | Plus, some unrelated changes to mp3lib/Makefile committed by accident. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ignore test program.diego2008-04-250-0/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26538 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile decode_i586.c on x86_32.diego2008-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26537 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless comments with compilation commands.diego2008-04-252-5/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26536 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix test program linking.diego2008-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26535 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add return statement, fixes the warning:diego2008-04-251-1/+1
| | | | | | | | | | | | | | test.c:75: warning: control reaches end of non-void function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26534 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove redundant declaration, fixes the warning:diego2008-04-251-1/+0
| | | | | | | | | | | | | | | | test.c:15: warning: redundant redeclaration of 'gCpuCaps' ../cpudetect.h:53: warning: previous declaration of 'gCpuCaps' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26533 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add return statement, fixes the warning:diego2008-04-251-1/+1
| | | | | | | | | | | | | | test2.c:72: warning: control reaches end of non-void function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26532 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable.diego2008-04-251-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26531 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing #include, fixes the warning:diego2008-04-251-0/+1
| | | | | | | | | | | | | | test2.c:65: warning: implicit declaration of function 'memcpy' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26530 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take name of getch file to link against from config.mak.diego2008-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26529 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge dvdread/Makefile into top-level Makefile.diego2008-04-252-25/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DVDCSS_INTERNAL has been renamed to LIBDVDCSS_INTERNAL.diego2008-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26527 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libfaad2/Makefile into top-level Makefile.diego2008-04-242-48/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL.diego2008-04-242-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libdvdcss/Makefile into top-level Makefile.diego2008-04-242-17/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpdemux/Makefile into top-level Makefile.diego2008-04-242-89/+73
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly include dependency information in top-level Makefile.diego2008-04-241-0/+2
| | | | | | | | | | | | | | The inclusion is skipped in mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2
| * dependency generation infrastructure for C++ filesdiego2008-04-243-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.diego2008-04-241-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure necessary header files are created before recursing.diego2008-04-241-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include base64.h with full path.diego2008-04-241-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move libfaad2 fixed-point CFLAGS setting to configure.diego2008-04-242-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26517 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Expand conditional addition of elements to variables with a form that permitsdiego2008-04-243-10/+7
| | | | | | | | | | | | | | using two conditions. This allows getting rid of some ifeqs in Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge stream/Makefile into top-level Makefile.diego2008-04-242-75/+68
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpcodecs/Makefile into top-level Makefile.diego2008-04-242-165/+163
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: alphabetical orderdiego2008-04-241-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26513 b3059339-0415-0410-9bf9-f77b7e298cf2
| * consistently print fps with three digits of precisioncorey2008-04-2316-24/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26512 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use existing MSGTR_FilefmtFourccSizeFpsFtime translatable string macrocorey2008-04-231-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26511 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Convert m_config.c to use tallocUoti Urpala2008-04-262-64/+32
| |
* | Move vf_settings to options structUoti Urpala2008-04-268-10/+13
| |
* | options.h: Field order cosmeticsUoti Urpala2008-04-261-1/+1
| | | | | | | | | | Move correct_pts and user_correct_pts next to each other. loop_times was accidentally added between them.
* | Move vo_gamma_* to options structUoti Urpala2008-04-266-40/+34
| |
* | command.c: cosmetic changes ("type * ptr" -> "type *ptr")Uoti Urpala2008-04-251-119/+119
| | | | | | | | | | | | These "type * ptr" cases were left in parameter lists from earlier automatic reindent. The "indent" binary does that when the type is an unrecognized typedef type.
* | Make video decoder description structs constUoti Urpala2008-04-2527-34/+34
| | | | | | | | | | | | This makes the per-decoder struct vd_functions and its ->info struct constants. Same for the mpcodecs_vd_drivers[] table of pointers to those structs.
* | Move vd_use_slices to options structUoti Urpala2008-04-257-10/+7
| |
* | Remove global vo_flagsUoti Urpala2008-04-255-10/+6
| | | | | | | | Move the information to struct sh_video field.
* | vd.c: Cosmetic changes + remove malloc.hUoti Urpala2008-04-251-15/+6
| | | | | | | | | | Adjust formatting slightly and remove some comments. Also remove "#include malloc.h" which seems completely irrelevant.
* | Reformat vd.cUoti Urpala2008-04-251-189/+221
| | | | | | | | | | "indent -kr -l79 -nut dec_video.c --ignore-newlines vd.c", fix two "sh_video_t * sh" to "sh_video_t *sh" by hand.
* | Move movie_aspect to options structUoti Urpala2008-04-2511-13/+8
| |
* | Move screen_size_xy to options structUoti Urpala2008-04-255-13/+10
| |
* | Move opt_screen_size_[x|y] to options structUoti Urpala2008-04-258-30/+25
| |
* | Move flip and softzoom to options structUoti Urpala2008-04-256-18/+14
| |
* | Move vidmode to options structUoti Urpala2008-04-255-8/+6
| |
* | Move fullscreen to options structUoti Urpala2008-04-254-6/+5
| |
* | Store video decoder functions in struct sh_video fieldUoti Urpala2008-04-253-28/+31
| | | | | | | | | | | | Remove the global variable mpvdec and move the video decoder pointer to struct sh_video field vd_driver. Audio already had a similar ad_driver field from before.
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-25109-465/+464
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | dec_video.c: A couple of cosmetic changesUoti Urpala2008-04-251-12/+7
| |
* | Reformat dec_video.cUoti Urpala2008-04-251-255/+293
| | | | | | | | | | | | "indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix some "unknown_typedef * arg" in parameter lists by hand to "unrecognized_typedef *arg".
* | Move -lavdopts to options structUoti Urpala2008-04-254-68/+80
| |
* | vd_ffmpeg.c: Eliminate some compiler warningsUoti Urpala2008-04-251-5/+5
| | | | | | | | | | Make the functions used in avctx->draw_horiz_band match its type (add a "const"). Add cast to avoid void * arithmetic.
* | Modify option helper macrosUoti Urpala2008-04-244-27/+27
| | | | | | | | | | | | | | Give them a OPT_ prefix, move them to m_option.h, move the "flags" parameter to third position (so all start with option name, field name, flags) and use "&m_option_type_x" in them instead of the indirect #define "CONF_TYPE_X".
* | Merge svn changes up to r26510Uoti Urpala2008-04-2397-422/+1802
|\| | | | | | | | | r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored.
| * There is no need to remove .a files from subdirectories, they are onlydiego2008-04-231-1/+1
| | | | | | | | | | | | | | created in the directories using recursive make. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libvo/Makefile into top-level Makefile.diego2008-04-233-34/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * EXTRAXX_INC flags should now be added to .depend compilation,diego2008-04-231-1/+1
| | | | | | | | | | | | | | not to the phony depend target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26508 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libao2/Makefile into top-level Makefile.diego2008-04-232-13/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless 0 flag from s printf conversion specifier, fixes the warning:diego2008-04-231-1/+1
| | | | | | | | | | | | | | TOOLS/movinfo.c:332: warning: '0' flag used with '%s' printf format git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26506 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take audio delay into account when seeking in avisynth demuxer.reimar2008-04-231-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26505 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Calculate fps as double-precision to make switching to double-precision fps ↵reimar2008-04-231-1/+1
| | | | | | | | | | | | values easier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26504 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge tremor/Makefile into top-level Makefile.diego2008-04-222-22/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26503 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move Tremor low accuracy CFLAGS handling to configure.diego2008-04-222-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26502 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add loader to PARTS on x86.diego2008-04-221-1/+4
| | | | | | | |