summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* http: fix potential NULL pointer issuewm42012-11-011-1/+4
| | | | Found by clang analyzer. Untested.
* demux_mkv: fix a hang with invalid filesUoti Urpala2012-11-011-0/+2
| | | | | | | | ebml_read_length() could return a negative value (as uint64_t though) at EOF, and this would then make ebml_read_skip() seek backwards. This could lead to an infinite loop at EOF with corrupt files. Add an extra check to make ebml_read_length() return EBML_UINT_INVALID instead if EOF is hit in the middle of parsing.
* manpage: --codecpath was removedwm42012-11-011-3/+0
|
* demux_ts: remove some incorrect usages of realloc_structreimar2012-10-311-19/+16
| | | | | | Remove some incorrect usages of realloc_struct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35318 b3059339-0415-0410-9bf9-f77b7e298cf2
* subreader: do not write outside array boundsreimar2012-10-311-2/+4
| | | | | | | Extra checks to ensure we really do not write outside array bounds. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35313 b3059339-0415-0410-9bf9-f77b7e298cf2
* cookies: replace sprintf with snprintfreimar2012-10-311-5/+7
| | | | | | | | | | Use snprintf instead of sprintf. No good reason beyond paranoia and Coverity complaining about it. In a very theoretical, construed case the adds might overflow or the environment might change in-between the getenv calls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35307 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cddb: replace sprintf with snprintfreimar2012-10-311-12/+14
| | | | | | | | | | Replace sprintf with snprintf. To my knowledge the only "real" issue this fixes is that setting certain environment variables to very long strings might have caused overflows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35306 b3059339-0415-0410-9bf9-f77b7e298cf2
* af_hrtf: clamp output to relieve noisesupsuper2012-10-311-4/+5
| | | | | | | | This patch relieves noises from af_hrtf by using av_clip_* instead of casting directly. There are still some noises, which indicates other bugs inside this filter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35304 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: set pointers to NULL after freereimar2012-10-311-0/+2
| | | | | | | | Set pointers to NULL after free. For the pal_image one it would have been possible to leak the old pointer of the malloc for "image" failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35303 b3059339-0415-0410-9bf9-f77b7e298cf2
* input: fix off-by-one errorreimar2012-10-311-1/+1
| | | | | | | | | | | | Fix off-by-one error in range check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35302 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: input/input.c This code is already quite different from mplayer-svn, but still the same bug.
* ao_oss: make error check slightly more correctreimar2012-10-311-1/+1
| | | | | | | | | | Only a return value of -1 indicates an error for open(), purely theoretically the mixer device could get 0 assigned as file descriptor. Even more theoretically, WinCE uses descriptors with values < 0, though that probably is non-conformant behaviour. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35295 b3059339-0415-0410-9bf9-f77b7e298cf2
* geometry: remove useless NULL checkreimar2012-10-311-2/+2
| | | | | | Remove useless checks, the code would crash all over of widw/widh were NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35292 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer: mark exit_player as noreturnwm42012-10-311-1/+3
| | | | Similar to mplayer-svn commit r35291.
* vo_vdpau: fix off-by-one errorreimar2012-10-311-1/+1
| | | | | | | | | Fix off-by-one error in check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35287 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libvo/vo_vdpau.c
* x11_common: make some variables staticreimar2012-10-311-2/+2
| | | | | | Make some variables static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35285 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common: make modecount variable globalreimar2012-10-311-3/+3
| | | | | | | Since the modecount variable is only ever initialized when the videmodes variable is, it also has to be a global variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35284 b3059339-0415-0410-9bf9-f77b7e298cf2
* config: better error reporting, make invalid option values non-fatalwm42012-10-311-19/+15
| | | | | | | | | | | Always print config file location and line number on config file parse errors. Print an error message with fatal log level if parsing failed completely. Setting an option to an invalid value in config files made loading these files fatal. There isn't really any need to make this a fatal error. Change it so that these cases don't abort loading. This is also more consistent with missing options. These weren't fatal either.
* commands: fix audio-delay propertywm42012-10-301-3/+5
| | | | | | | SET simply didn't set the variable correctly. Chain the property as generic option, so the property code will return the correct type for the property, as well as implement the GET part.
* commands: make media-title property return filename in default casewm42012-10-301-14/+15
| | | | Instead of the full path.
* fmt-conversion: guard ffmpeg-only pixel formatwm42012-10-301-0/+3
| | | | This should fix compilation with libav.
* cleanup: remove some things related to old video decoderswm42012-10-304-55/+18
|
* mplayer: fix multiline terminal OSDwm42012-10-301-0/+3
| | | | | | | | | | | | | | | | When an OSD message printed to the terminal was multiple lines, the second line overwrote the status line. If that second line was shorter than the status line, awkward looking remains of the status line were left on the terminal. Fix this by writing an empty status line before printing the OSD message. This will clear the status line text. Also, print the status line again after the OSD message is printed - this makes output consistent with the single-line OSD message case. Remaining caveat: only the last line of a multiline OSD message is cleared when the OSD message is removed. But this is probably fine.
* demux_lavf, ad_ffmpeg: don't change AVCodecContext.block_alignwm42012-10-301-1/+1
| | | | | | | | | | | If block_align was 0, demux_lavf changed it to 1. This breaks at least decoding of IMA ADPCM in LVF. Pass it through without changing instead. (nBlockAlign as set in demux_lavf is put back into lavc's block_align in ad_ffmpeg.) This reverts 296f360f82e5. This commit gives no explanation why it does things the way it does. But since nothing in mpv uses nBlockAlign anymore except ad_ffmpeg, this is probably safe.
* codecs.conf: cleanup: remove stale entrywm42012-10-301-8/+0
|
* demux_lavf: add a hack to work around other hackswm42012-10-304-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mplayer (and all forks) use a single FourCC field to map codecs. This is what sh_video->format and sh_audio->format is used for. Basically it's a key into the codecs.conf table to find out what decoder to use. (There's only one video codec and one major audio codec left - both libavcodec. But we still have to deal with mapping coming from non-libavformat demuxers.) It seems this causes some video codecs to fail, such as WV1F in AVI [1]. demux_lavf generally throws away the codec_tag from libavformat if the codec is MPEG-in-AVI. There are probably other cases like this. Add a hack to enforce passing the correct codec tag when only ffmpeg demuxers and decoders involved. Note: the sample [1] needs to be flipped. With --demuxer=avi, this is done correctly, because unlike demux_lavf, the demuxer uses the FourCC directly for the sh_video->format tag, and finds the correct codecs.conf entry (which contains the flip flag). We could just add a "whitelist" of codec tags which can be passed through to sh_video->format, but I don't want to do that just for such an obscure format as the sample at hand. Note 2: when demux_lavf is used, the AVCodecContext could be passed directly to vd_ffmpeg/ad_ffmpeg. The code to convert to/from the internal mplayer stream headers is probably still needed, as there are non-ffmpeg demuxers and audio decoders. [1] http://samples.mplayerhq.hu/V-codecs/WV1F/AVI/title2.avi
* configure: bump required ffmpeg library versionswm42012-10-301-1/+1
| | | | | | | | libavutil: for av_get_packed_sample_fmt() libavcodec: for avcodec_encode_video2() It's actually untested whether these are really the minimum required versions. I didn't want to bump them further yet.
* input: remove default bindings for sub_stepwm42012-10-301-2/+2
| | | | | The sub_step command is not that useful, and accidentally hitting it means that the subtitle delay gets completely messed up.
* command: make property "deinterlace" unavailable if deinterlacer absentwm42012-10-301-3/+5
| | | | | | | | | The "deinterlace" property was stuck at "no" if there wasn't actually any switchable deinterlacer (like yadif or vdpau) in the video chain. Also, take care of returning only 0/1 values. It appears yadif and vdpau return their current deinterlacer mode, which is not always the value 0 or 1.
* options: remove --hr-mp3-seekwm42012-10-303-12/+0
| | | | | | | This didn't do anything anymore. Even before the internal audio demuxer was removed, demux_lavf was used by default for mp3. Use --hr-seek instead.
* options: remove --adapterwm42012-10-306-34/+0
| | | | | This probably didn't do anything. Maybe OpenGL VOs on win32 actually could make use of it, but even then it probably didn't work.
* cleanup: remove M_OPT_NOCMDwm42012-10-302-13/+2
| | | | Unused.
* manpage: -benchmark was renamed to -untimedwm42012-10-301-0/+1
|
* options: rename -ni to -avi-niwm42012-10-305-4/+5
| | | | | | | | The -ni option does something with the AVI demuxer only. Also fix misleading error messages when the packet queue overflows (it suggests using -ni, which in the typical case of playing NI AVI files will not work, as demux_lavf is used by default).
* options, avi: remove -loadidx/-saveidxwm42012-10-305-78/+0
| | | | This was probably useless even many years ago.
* cleanup: remove references to CONFIG_TV_DSHOWwm42012-10-302-16/+3
|
* cleanup: remove references to CONFIG_XVID4wm42012-10-301-4/+0
|
* screenshot: printf format "%.*s" takes an int, not ptrdiff_twm42012-10-301-1/+1
|
* stream: fix redirection for proxy URLsreimar2012-10-303-15/+55
| | | | | | | | | | | Fix redirection for proxy URLs. Should fix bug #2091. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35207 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: stream/url.c
* url: simplifycboesch2012-10-303-25/+43
| | | | | | | | | | | | | | | | | | | | Use mp_asprintf in make_noauth_url and make_http_proxy_url. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32971 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: cboesch Conflicts: stream/url.c Note: the mp_asprintf() function was introduced in r32970, and put into its own files. We just put that directly into url.c, as we use talloc_asprintf() in general, and mp_asprintf() is for url.c code only. (Making url.c use talloc would probably result in a big mess.) Make proxy and url parameter const in get_noauth_url and get_http_proxy_url. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32972 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: cboesch
* libmpcodecs: fix coverity issuesreimar2012-10-305-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix check for empty log file (n contains a start offset of 15). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35269 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Add missing (). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35270 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_down3dright.c Add comment to silence coverity (and it generally doesn't hurt to make intentional fallthrough cases explicit). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35271 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Make uninit function handle vf->priv being NULL. This happens in the case where memory allocation for it fails. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35272 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Remove useless variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35273 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_softpulldown.c
* stream: add STREAM_CTRL_GET_CURRENT_TITLEib2012-10-304-0/+14
| | | | | | | | Add new stream control command STREAM_CTRL_GET_CURRENT_TITLE for DVDs. This provides the current title (aka track) number of a DVD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35263 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: enable STREAM_CTRL_GET_NUM_TITLESib2012-10-301-0/+3
| | | | | | | | Allow STREAM_CTRL_GET_NUM_TITLES with cache enabled. This is missing in r34474. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35258 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_screenshot: fix handling of out-of-order slice rendered framesreimar2012-10-301-4/+2
| | | | | | Fix handling of out-of-order slice rendered frames. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35208 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo, vf_unsharp: clear mpi->priv for consistencyreimar2012-10-302-0/+2
| | | | | | For consistency clear mpi->priv after it was used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35203 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo: fix using with numbered mpireimar2012-10-301-1/+4
| | | | | | | | Fix delogo filter with numbered mpi. Should fix bug #2087. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35202 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: fix reading teletext languagereimar2012-10-301-1/+1
| | | | | | | Fix reading language from teletext descriptor when it is not the first descriptor in the block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35198 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: cosmeticsreimar2012-10-301-10/+10
| | | | | | | | | | Remove "inline" from functions that are definitely not absolutely critical for performance. The compiler should be able to make a more intelligent decision on its own. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35197 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp_image: update description of MP_IMGFLAG_READABLEreimar2012-10-301-1/+8
| | | | | | Update description of MP_IMGFLAG_READABLE. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35150 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf: fix usage count for passthrough-only filtersreimar2012-10-301-1/+3
| | | | | | | | | Fix usage count for passthrough-only filters. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35135 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpcodecs/vf.c
* vd_ffmpeg: detect broken mpi usage countreimar2012-10-301-0/+4
| | | | | | Detect broken mpi usage count also in decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35134 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer: add missing newline in error messagecehoyos2012-10-301-1/+1
| | | | | | Add missing newline in error message. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35120 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: fix long hangsreimar2012-10-301-1/+1
| | | | | | | | | | Avoid sleeping 0 ms, this can cause sleep to be not called at all. This will then cause long hangs e.g. when sleeping on single-CPU/core computers. Should fix bug #2084. Patch suggested by Visenri [visenri yahoo es] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35119 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavf: support SRT subtitlesreimar2012-10-301-2/+2
| | | | | | | | | | | Support subrip format subtitles. Patch by Philip Langdale [philipl overt org]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35118 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c
* demux_lavf: do not special case ID_TEXT subs on program switchingreimar2012-10-301-1/+1
| | | | | | | | | | | | | | When switching programs select subtitle stream regardless of whether the format is text, ASS, bitmap or whatever. There probably was some good reason for the condition but it got lost in time and special-casing CODEC_ID_TEXT over other test-based subtitles doesn't seem to make much sense. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35117 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c
* stream_file: explicitly signal EOFreimar2012-10-301-0/+2
| | | | | | | | | Explicitly signal EOF when reaching the end of a file/pipe. Fixes a 4 second delay due to stream_reconnect for e.g. echo | mplayer - git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35112 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ts: add support for PCM variant found on BluRayreimar2012-10-301-0/+7
| | | | | | TS demuxer: Add support for PCM variant found on BluRay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35106 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_stereo3d: add another anaglyph color variantreimar2012-10-301-12/+30
| | | | | | | | | | | | | | | | | | | | | | | Make compiler give the ana_coeff array automatically the right size. Makes adding more colour schemes easier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Convert comments into designated initializers. That is a simple way to ensure they always correspond to what the compiler actually does. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Add another anaglyph color variant. Patch by Bob [mpbob ezpi net]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* vf_expand: remove outdated code causing crashesreimar2012-10-301-6/+0
| | | | | | | | | | | | | | | | | Remove outdated code that instead of preventing now causes crashes. The problem it was trying to catch (next filter not supporting slices) was fixed already in r10141 (by implementing a fallback version of vf_next_draw_slice). This should fix Debian Bug#683907. Example command-line: mencoder big_buck_bunny_480p_stereo.avi -o a.mpg -vf crop=346:240:2:24 -oac copy -ovc lavc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35061 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar Conflicts: libmpcodecs/vf_expand.c
* options: fix URL user/password parsingUoti Urpala2012-10-301-2/+2
| | | | | | | Code parsing the optional user/password part for some URL types given as files to play, such as "ftp://user:password@host/filename", was broken. Fix. I guess this isn't used much as nobody reported it earlier.
* stream_ftp: fix double free in one error caseUoti Urpala2012-10-301-1/+0
|
* af_scaletempo: reset latency info when reconfiguringUoti Urpala2012-10-281-0/+3
| | | | | | | | af_scaletempo kept outdated values in the af->delay field after reconfiguration until some audio was fed through the filter. This could affect audio sync code after a playback speed change. Additionally, in the special case speed=1 the code did not set the af->mul field at all. Initialize both fields after reconfiguration.
* stream_ffmpeg: handle rtsp:// URLs by default, add lavf://Uoti Urpala2012-10-283-22/+31
| | | | | | | | | | | Make stream_ffmpeg handle rtsp:// URLs by default, without requiring ffmpeg://rtsp://. Previously (after removal of other rtsp implementations) rtsp:// fell back to using HTTP, which was unlikely to work. Also add lavf:// as an alternative to ffmpeg:// to force the stream implementation. Since libavformat can come from Libav rather than FFmpeg, using the ffmpeg name in the prefix is misleading.
* cleanup: remove vd_internal.hwm42012-10-231-48/+0
| | | |