summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* osdep: Change timer_name to a saner typeUoti Urpala2008-04-284-4/+4
| | | | | timer_name was a (non-const) pointer to a const char array. Make the symbol the array itself.
* m_option.h: #include <stddef.h> for offsetofUoti Urpala2008-04-281-0/+1
|
* loader/qtx/qtxsdk/components.h: Disable large unused inline functionsUoti Urpala2008-04-281-0/+2
| | | | | Put various dump_* functions under #if 0. They aren't used by any current code but trigger compiler warnings.
* demux_mkv.c: Compiler warning fixesUoti Urpala2008-04-281-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | * libmpdemux/demux_mkv.c:218: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type * libmpdemux/demux_mkv.c:1235: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type Change grow_array to return the reallocated pointer instead of setting it through a void **. * libmpdemux/demux_mkv.c:1396: warning: unused variable ‘mkv_d’ Remove. * libmpdemux/demux_mkv.c:1740: warning: pointer of type ‘void *’ used in arithmetic Change struct mkv_track->private_data from void * to unsigned char *. * libmpdemux/demux_mkv.c:2693: warning: assignment from incompatible pointer type Add a cast. * libmpdemux/demux_mkv.c:2239: warning: ‘demux_mkv_reverse_id’ defined but not used Remove the function (together with preceding useless advance declaration of demux_mkv_seek).
* Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Uoti Urpala2008-04-285-26/+32
| | | | | | | | | | | | Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/, libavformat/, libpostproc/ subdirectories make MPlayer build with a complete checkout of FFmpeg under ffmpeg/. configure now creates config.mak and config.h at both the top level and in ffmpeg/. The config.h files are identical. The config.mak for FFmpeg has different include paths. The top-level common.mak and subdir.mak are now used by libswscale only; the directories under ffmpeg/ use the versions in ffmpeg/.
* Merge svn changes up to r26555Uoti Urpala2008-04-2812-136/+109
|\
| * Merge mp3lib/Makefile into top-level Makefile.diego2008-04-273-22/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge liba52/Makefile into top-level Makefile.diego2008-04-272-19/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary compilation command that shadows GNU Make builtin command.diego2008-04-271-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26553 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary -lm linker flag from test program compilation command.diego2008-04-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26552 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpeg2/Makefile into top-level Makefile.diego2008-04-262-23/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
| * clean and distclean rules do the same thing.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26550 b3059339-0415-0410-9bf9-f77b7e298cf2
| * clean and distclean rules do the same thing.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/Makefile into top-level Makefile.diego2008-04-263-58/+37
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge clean and distclean rules.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark alltools target as phony.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile libmpcodecs/ve_qtvideo.c on Windows.diego2008-04-263-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add alltools target and variable to build non-linking tools.diego2008-04-261-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add vidix to parts when VIDIX is enabled.diego2008-04-261-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take Objective C files into account when generating dependencies.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add rule for generating dependency files from Objective C files.diego2008-04-261-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Add .gitignore filesUoti Urpala2008-04-272-0/+21
| |
* | vd.c: Make extern decoder declarations constUoti Urpala2008-04-261-23/+23
| | | | | | | | | | | | The earlier commit "Make video decoder description structs const" made the definitions const but didn't change the extern declarations in vd.c to match. Fix those to be const too.
* | Make audio decoder description structs constUoti Urpala2008-04-2629-56/+56
| | | | | | | | | | | | Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs.
* | vf_divtc.c: Make pointlessly static variable a normal localUoti Urpala2008-04-261-1/+1
| | | | | | | | | | | | Apparently because it was declared together with local constant tables (for which the "static" part was useless but harmless) a pointer variable was also declared static.
* | Mark some constant symbols as suchUoti Urpala2008-04-2616-34/+34
| |
* | Move initialized_flags to mpctxUoti Urpala2008-04-262-28/+27
| | | | | | | | | | | | | | | | The function exit_sighandler had a line if(initialized_flags==0 && sig_count>1) exit(1); rather than try to make this work without the variable I just removed the line as it looks unlikely this condition would occur except very rarely.
* | Move global filename to mpctxUoti Urpala2008-04-265-45/+43
| |
* | Disable automatic playlist parsing properlyUoti Urpala2008-04-261-0/+6
| | | | | | | | | | | | The playlist code is unsafe to use with potentially hostile sources. It was disabled by default for local files but not for network streams. Make sure it is not automatically triggered for network streams either.
* | Silence "discards qualifiers" warnings when compiling mplayer.cUoti Urpala2008-04-264-19/+19
| | | | | | | | | | | | | | | | | | | | Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const.
* | 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