wm4 c768a00dfe mplayer: prefer -sub/-subfile subs over auto-loaded subs ...

Before this commit, it was more or less random which subtitle was
preferred if there was both an auto-loaded external subtitle, and a
subtitle loaded via -sub or -subfile. -sub subtitles happened to be
preferred over auto-loaded subs, while -subfile didn't. Fix the -subfile
case, and make the behavior consistent by making the selection behavior
explicit.

2013-04-20 23:48:26 +02:00

..

input

Remove some apple remote leftovers

2013-04-05 23:59:39 +02:00

timeline

core: matroska: support concatenated segments

2013-04-20 23:28:23 +02:00

asxparser.c

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

asxparser.h

…

av_common.c

av_common: allow calling mp_codec_to_av_codec_id() with NULL

2013-04-20 23:28:26 +02:00

av_common.h

demux_lavf, ad_lavc, vd_lavc: pass codec header data directly

2013-02-10 17:25:57 +01:00

av_log.c

demux_lavf: add support for libavdevice

2012-12-03 21:08:51 +01:00

av_log.h

…

av_opts.c

…

av_opts.h

…

bstr.c

Replace strsep() uses

2013-01-13 17:32:39 +01:00

bstr.h

Replace strsep() uses

2013-01-13 17:32:39 +01:00

cfg-mplayer.h

core: add --reset-on-next-file option

2013-04-10 21:32:46 +02:00

codecs.c

core: redo how codecs are mapped, remove codecs.conf

2013-02-10 17:25:56 +01:00

codecs.h

core: redo how codecs are mapped, remove codecs.conf

2013-02-10 17:25:56 +01:00

command.c

command: try to switch subs too for program property

2013-04-20 23:28:25 +02:00

command.h

command: give feedback on the OSD if a property is unavailable

2013-02-16 21:41:24 +01:00

cpudetect.c

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

cpudetect.h

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

defaultopts.c

core: remove volstep global variable

2013-04-09 02:41:46 +02:00

defaultopts.h

…

encode_lavc.c

encoding: when output is pipe: or pipe:1, avoid mp_msg to stdout

2013-04-15 13:30:21 +02:00

encode_lavc.h

Remove vo_fps global variable

2013-03-04 22:21:57 +01:00

encode.h

Remove vo_fps global variable

2013-03-04 22:21:57 +01:00

m_config.c

core: add --reset-on-next-file option

2013-04-10 21:32:46 +02:00

m_config.h

core: add --reset-on-next-file option

2013-04-10 21:32:46 +02:00

m_option.c

m_option: pretty-print floats with 3 pre-decimal digits instead of 2

2013-03-26 01:29:54 +01:00

m_option.h

vo_opengl: split into multiple files, convert to new option API

2013-03-28 21:46:17 +01:00

m_property.c

input: make input command deprecation warnings visible

2013-03-26 01:29:38 +01:00

m_property.h

…

m_struct.c

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

m_struct.h

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

mp_common.c

cleanup: remove duplicated function, move escape parsing function

2013-02-16 23:24:46 +01:00

mp_common.h

cleanup: remove duplicated function, move escape parsing function

2013-02-16 23:24:46 +01:00

mp_core.h

mplayer: prefer -sub/-subfile subs over auto-loaded subs

2013-04-20 23:48:26 +02:00

mp_fifo.c

Prefix keycode defines with MP_

2013-02-12 10:27:00 +01:00

mp_fifo.h

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

mp_msg.c

encoding: when output is pipe: or pipe:1, avoid mp_msg to stdout

2013-04-15 13:30:21 +02:00

mp_msg.h

encoding: when output is pipe: or pipe:1, avoid mp_msg to stdout

2013-04-15 13:30:21 +02:00

mp_osd.h

osd: always update already visible OSD bar on seeks

2013-02-16 20:50:05 +01:00

mp_talloc.h

video/filter: change filter API, use refcounting, remove filter DR

2013-01-13 20:04:10 +01:00

mplayer.c

mplayer: prefer -sub/-subfile subs over auto-loaded subs

2013-04-20 23:48:26 +02:00

mplayer.h

core: remove a number of global variables

2013-03-08 02:12:53 +01:00

options.h

core: add --reset-on-next-file option

2013-04-10 21:32:46 +02:00

parser-cfg.c

parser-cfg: fix profile-desc

2013-02-18 17:01:25 +01:00

parser-cfg.h

…

parser-mpcmd.c

options: fix --no-shuffle and --no-{

2013-02-23 00:07:11 +01:00

parser-mpcmd.h

…

path.c

path: add mp_find_config_file and reorganize some of the code

2012-12-15 17:38:00 +01:00

path.h

path: add mp_find_config_file and reorganize some of the code

2012-12-15 17:38:00 +01:00

playlist_parser.c

options: rename -ss and -endpos, allow relative times

2012-11-16 21:21:15 +01:00

playlist_parser.h

…

playlist.c

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

playlist.h

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

quvi.c

Fix lots of bugs in mp_http URL handling

2013-01-10 14:11:26 +01:00

screenshot.c

screenshot: show a message on each screenshot taken

2013-02-26 01:55:52 +01:00

screenshot.h

screenshot: show a message on each screenshot taken

2013-02-26 01:55:52 +01:00

subopt-helper.c

Rename directories, move files (step 2 of 2)

2012-11-12 20:08:18 +01:00

subopt-helper.h

…

version.c

build: identify the build time of the binary in the versioning output

2012-12-03 21:08:51 +01:00