summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30702Uoti Urpala2010-03-1010-46/+48
|\
| * Remove pointless '#if 1' preprocessor directive.diego2010-02-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30702 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add declaration for exp_EH_prolog_dummy().diego2010-02-221-0/+1
| | | | | | | | | | | | | | This avoids a warning with -Wmissing-prototypes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30701 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare all public mp3lib functions in mpg123.h.diego2010-02-223-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30700 b3059339-0415-0410-9bf9-f77b7e298cf2
| * wording fixesdiego2010-02-222-6/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30699 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare functions from network.c in network.h.diego2010-02-223-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30698 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move struct streaming_control from network.h to stream.h, where it is used.diego2010-02-222-22/+24
| | | | | | | | | | | | | | This will help in declaring some public functions where they really belong. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30697 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove commented-out declaration of non-existing function streaming_start.diego2010-02-221-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30696 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30695Uoti Urpala2010-03-100-0/+0
|\|
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-2214-31/+18
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30694Uoti Urpala2010-03-1012-140/+223
|\|
| * Declare public function print_vprp() in aviprint.h.diego2010-02-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30694 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add public function VideoForWindowsVersion() to the appropriate header file.diego2010-02-211-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30693 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for v4l2_write() instead of forward declaring it.diego2010-02-213-2/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare stream_fill_buffer() and stream_seek_long() unconditionally.diego2010-02-211-2/+3
| | | | | | | | | | | | | | | | They are public functions that are unconditionally compiled, so they should not be declared conditionally. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30691 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for asf_mmst_streaming_start() instead of forward declaring it.diego2010-02-213-3/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30690 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only #define WIN32_LOADER if it has not been #defined already, fixes warning:diego2010-02-211-0/+2
| | | | | | | | | | | | | | loader/win32.c:27:1: warning: "WIN32_LOADER" redefined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30689 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for exported DVB-related functions.diego2010-02-212-0/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30688 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move functions around to avoid forward declarations and #ifdefs.diego2010-02-211-134/+119
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30687 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30686Uoti Urpala2010-03-100-0/+0
|\| | | | | | | Already done in git earlier.
| * Drop weird and unnecessary _s/_st suffixes from demuxer struct names.diego2010-02-214-20/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add names to anonymous structs sh_common, sh_audio, sh_video, sh_sub.diego2010-02-211-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30685 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-2191-402/+402
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30683Uoti Urpala2010-03-1086-165/+206
|\|
| * Fix fps output with -identify when frame rate extension is used for MPEG-2reimar2010-02-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30683 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize frame rate extension fields in mp_header_process_sequence_headerreimar2010-02-211-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30682 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Parse and use the information from the frame rate extension header for MPEG-2.reimar2010-02-213-4/+11
| | | | | | | | | | | | | | | | -identify still does not show the right values though. Fixes bug #1636. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename open() vf initialization function to vf_open().diego2010-02-2179-158/+157
| | | | | | | | | | | | | | This avoids clashes with fcntl.h under certain circumstances. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg supports Bink, let MPlayer play it as wellkostya2010-02-212-0/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30679 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add malloc.h #include for memalign(), fixes the warning:diego2010-02-211-2/+5
| | | | | | | | | | | | | | libmpcodecs/vd_dmo.c:81: warning: implicit declaration of function 'memalign' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30678 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explain that -mc 0 will need -noskip.reimar2010-02-201-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30677 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30676Uoti Urpala2010-03-100-0/+0
|\| | | | | | | Already done long ago in git.
| * Mark ad_functions_t structures and mpcodecs_ad_drivers array as const.diego2010-02-203-29/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30676 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30675Uoti Urpala2010-03-1024-37/+6
|\|
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-20159-230/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add asx_parser_build_tree() to asxparser.h instead of forward declaring it.diego2010-02-202-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30674 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30673Uoti Urpala2010-03-100-0/+0
|\| | | | | | | Modifying an unused function...
| * Mark m_config_get_option_ptr() as static, it is only used within the file.diego2010-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30673 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30672Uoti Urpala2010-03-107-744/+801
|\|
| * Add standard license header.diego2010-02-201-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30672 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: K&R coding style, indent with 4 spaces, no tabsdiego2010-02-201-733/+776
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30671 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print response headers as debugging output also for HTTP seeks.reimar2010-02-201-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30670 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l, fix a close() that should be a closesocket()reimar2010-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30669 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not discard stream buffer on eof, instead reuse it to slightly improvereimar2010-02-203-5/+7
| | | | | | | | | | | | | | format autodetection with -nocache and non-seekable streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30668 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.reimar2010-02-201-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30667 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print demuxer name in "freeing demuxer" message.reimar2010-02-201-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30666 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30665Uoti Urpala2010-03-100-0/+0
|\|
| * FFmpeg: Add HAVE_ALIGNED_{8,16} to config.h on ppc and x86.diego2010-02-201-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30665 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg: Add tomi to architecture list.diego2010-02-202-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30664 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-1029-116/+231
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Fix mov reference files: for video/quicktime mime do not force a demuxerreimar2010-02-201-1/+5
| | | | | | | | | | | | | | | | but do autodetection. This tries lavf first but will also try native demuxer for reference files where open fails for the lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print all 64 bits of seek position.reimar2010-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30662 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure we do not try to use IPv6 with winsock2, we end up connectingreimar2010-02-201-0/+8
| | | | | | | | | | | | | | to random addresses, causing huge delays. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30661 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.reimar2010-02-191-0/+5
| | | | | | | | | | | | | | This makes the vos try to redraw the video if they can. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30660 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move code that makes the filter chain match the desired output format intoreimar2010-02-191-42/+55
| | | | | | | | | | | | | | | | | | a separate function. Call this function also from af_add, fixes audio corruption with e.g. -softvol -af format=s16be (bug #1561). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30659 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some pointless '#if 1' preprocessor directives.diego2010-02-191-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30658 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it.diego2010-02-192-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30657 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.komh2010-02-192-0/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30656 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing 'defined' for __bsdi__.komh2010-02-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30655 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless '#if 1' preprocessor directives.diego2010-02-198-22/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove commented-out #include.diego2010-02-191-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30653 b3059339-0415-0410-9bf9-f77b7e298cf2
| * TOOLS/realcodecs: Remove pointless '#if 1' preprocessor directives.diego2010-02-194-8/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30652 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 rev. 30611jrash2010-02-191-9/+90
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30651 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace platform preprocessor check by HAVE_DOS_PATHS.komh2010-02-193-6/+6
| | | | | | | | | | | | | | This is both more elegant and more portable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30650 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless CONFIG_SETLOCALEkomh2010-02-191-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30649 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DirectShow requires stride to be a multiple of 4 for RGB24/BGR24, addreimar2010-02-181-10/+39
| | | | | | | | | | | | | | a special case to the DMO decoder to handle this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30648 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge declaration and initialization.reimar2010-02-182-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30647 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DShow and DMO decoders need MP_IMGFLAG_COMMON_PLANEreimar2010-02-182-2/+2
| | | | | | | |