summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* FixHEADmasterRaghavendra D Prabhu2011-07-091-1/+1
* Merge branch 'upstream'Raghavendra D Prabhu2011-07-0911-30/+35
|\
| * FixesupstreamRaghavendra D Prabhu2011-07-092-2/+2
| * vd_ffmpeg: make "-lavdopts lowres" handling more robustUoti Urpala2011-07-091-11/+11
| * vd_ffmpeg: fix "-lavdopts skipframe" supportUoti Urpala2011-07-091-1/+5
| * cleanup: silence most of the clang warningsClément Bœsch2011-07-099-16/+17
* | Merge branch 'upstream'Raghavendra D Prabhu2011-07-08117-5310/+5567
|\ \ | |/
| * build: add a hack to prevent name collision with libtallocUoti Urpala2011-07-071-0/+10
| * vo_directx: include <libavutil/common.h> for FFMINUoti Urpala2011-07-071-0/+1
| * configure: clang: set custom warning flags for clangUoti Urpala2011-07-071-0/+2
| * build: Revert "codec-cfg.c: avoid including aviheader.h"Uoti Urpala2011-07-071-3/+2
| * configure: rename "--disable-ass" to "--disable-libass"Uoti Urpala2011-07-061-4/+4
| * demux/mp_taglists: Move Bink audio tags to override listAnton Khirnov2011-07-061-2/+2
| * Merge branch 'mplayer1_changes'Uoti Urpala2011-07-0653-1158/+1072
| |\
| | * stream.c: make reconnect checks more robustreimar2011-07-061-14/+21
| | * stream.c: Pass streaming_ctrl eof on to struct stream fieldreimar2011-07-061-0/+2
| | * stream/network: don't clobber buffer byte counts on errorreimar2011-07-061-0/+1
| | * stream/network: distinguish EOF/error in streaming control APIreimar2011-07-061-1/+2
| | * cache: don't modify argument when stream control failsreimar2011-07-061-2/+3
| | * cleanup: silence some clang warningsreimar2011-07-063-4/+4
| | * demux_rtp.cpp: Add a hack to receive audio while probing video FPSreimar2011-07-061-1/+26
| | * manpage: improve vo_gl "stereo" suboption descriptionptt2011-07-061-19/+21
| | * codecs.conf: add yv16 raw fourcccompn2011-07-061-0/+2
| | * configure: Remove obsolete test for ARM pld instructiondiego2011-07-061-7/+1
| | * cleanup: demux_vqf: typo/wording fixesdiego2011-07-061-2/+2
| | * loader/module.c: Fix compilation with --disable-qtxreimar2011-07-061-5/+5
| | * stream/tvi_v4l[2]: fix calculation of free RAM for buffersiive2011-07-063-17/+11
| | * codecs.conf: add vfw csmcodec for fourcc CSM0, map YV24 fourcc to raw444P codeccompn2011-07-061-0/+11
| | * configure: fix check for clang compilerdiego2011-07-061-2/+1
| | * configure: fix mmxext detection with --disable-ssereimar2011-07-061-3/+2
| | * cpudetect.c: check OS SSE support only with runtime detectionreimar2011-07-061-1/+4
| | * cleanup: tvi_dshow: add "static", fix printf formatdiego2011-07-061-9/+16
| | * demux_lavf: Do not set AVIOContext for AVFMT_NOFILE formatsreimar2011-07-061-5/+7
| | * vo_gl: fix YUY2/YVYU colorspace mixupreimar2011-07-062-2/+4
| | * options: allow colorspace options to recognize "yvyu"reimar2011-07-061-0/+1
| | * cosmetics: img_format.h: document some formatsreimar2011-07-061-11/+11
| | * options: Allow a larger range for -aspectreimar2011-07-061-1/+1
| | * cleanup: vo_directx: remove redundant codereimar2011-07-061-94/+23
| | * demux_lavf: fix code printing subtitle typereimar2011-07-061-2/+2
| | * cleanup: mplayer.c: Factor out a bit of spudec codereimar2011-07-061-4/+8
| | * vo_directx: Change vo_directx to use w32_common.creimar2011-07-061-370/+43
| | * VO: w32_common: also generate VO_EVENT_MOVEreimar2011-07-061-0/+8
| | * codec-cfg.c: avoid including aviheader.hreimar2011-07-061-2/+3
| | * vf_stereo3d: Add support for converting to interleaved 3Dreimar2011-07-062-6/+45
| | * playlist: Support "Length" option in .pls playlist filesreimar2011-07-061-2/+10
| | * VO: support Pause/Break key in X11 inputdiego2011-07-062-1/+3
| | * playtree: make some char * function arguments constreimar2011-07-062-11/+10
| | * cache: allow STREAM_CTRL_GET_CURRENT_TIME with cachereimar2011-07-061-3/+12
| | * cosmetics: cache2.c: Fix commentreimar2011-07-061-2/+2
| | * cosmetics: stream_dvdnav.c: Remove pointless ()reimar2011-07-061-9/+9