1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 15:00:27 +00:00
Commit Graph

190 Commits

Author SHA1 Message Date
Uoti Urpala
b3a688d45f options: move -alang and -slang to option struct
The option field corresponding to -slang is now called "sub_lang"
instead of the old misleading global name "dvdsub_lang". The code
handling -slang in subreader.c looks rather broken; disable it instead
of converting it to use the option field.
2010-05-22 10:11:15 +03:00
Uoti Urpala
9a34ae4fd0 Merge svn changes up to r31050 2010-04-26 18:46:18 +03:00
diego
7120f1dfba Merge two redundant if checks, patch by ubitux, ubitux gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31042 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:42:28 +00:00
diego
e903e9eb5e cosmetics: reindent demux_ogg.c to K&R style plus some prettyprinting
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31041 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:34:32 +00:00
Uoti Urpala
00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala
b996250a2a Merge svn changes up to r30879 2010-03-10 03:20:23 +02:00
Uoti Urpala
e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
reimar
e03ff1e0ef Return MP_NOPTS_VALUE if we can't figure out the pts, not 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30879 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:21:39 +00:00
reimar
da87897b1b Improve handling of 0-size ogg packets.
Fixes bug 1664.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30878 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:19:32 +00:00
reimar
136c046e06 Add cast to proper type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30738 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:44:02 +00:00
diego
0055441774 Add header for AVI print functions; avoids many forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 00:18:50 +00:00
diego
e01e094438 Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:36:44 +00:00
diego
2dbe8cf340 Mark demux_ogg_sub_id() as static; it is not used outside of the file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30625 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:27:47 +00:00
diego
a37c279d27 Move up demux_ogg_sub_id, demux_ogg_sub_reverse_id; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:25:02 +00:00
diego
d28c27df8d Add header file for store_ughvlc(); avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30622 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:02:13 +00:00
diego
eafb70de50 libmpdemux: Mark functions not used outside of their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 22:01:35 +00:00
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
reimar
ae7068047a Find and take into account stream start time for ogg files.
This also makes the demuxing function set the keyframe flag for
vorbis packets that aren't header packets and have a time stamp,
even if we do not have vorbis_info struct yet.
The reason for this is that header packets always have 0 as time stamp.
Fixes bug #1585


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29776 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-16 08:42:00 +00:00
Uoti Urpala
d6c410b54c Replace libavutil internal header #includes with MPlayer copies
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03:00
Uoti Urpala
a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala
6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
reimar
ea47ab2a9f In all demux_info_add calls change "name" to "title".
Currently "name" and "title" are both used at random, this makes it consistent.
"title" was chosen because it is less ambiguous and also the get_meta_title
slave mode command uses that (there is no get_meta_name command).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-30 13:18:57 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego
f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego
e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego
091d352d06 Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:36:07 +00:00
Uoti Urpala
6cce822505 Merge svn changes up to r27399
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
2008-08-02 22:04:35 +03:00
diego
96a506733d Change a bunch of codec-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 16:30:32 +00:00
diego
d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-01 20:28:58 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
reimar
bf91f83022 Get rid of horrible code that relies on codec-set context variable,
it is useless anyway since all the necessary information is available anyway.
This also makes MPlayer display the correct length for Theora-in-Ogg-Videos.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27354 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-26 22:27:50 +00:00
Uoti Urpala
66bd120a3a Move dvdsub_id to options struct
Name the field "sub_id" as it's not specific to DVD subs.

Remove some other unused extern declarations together with dvdsub_id
from demux_mkv.c and demux_lavf.c.
2008-04-23 13:48:38 +03:00
Uoti Urpala
7039bc090a Add option pointer to demuxers and stheader.h structs 2008-04-23 13:41:05 +03:00
eugeni
a2fad60c7f Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
track language.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:39 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
reimar
5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar
35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
reimar
951bc25530 Add some const/static qualifiers as appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25523 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-24 16:27:52 +00:00
reimar
f9dd4f27ba Use realloc_struct in more places for consistency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25522 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-24 16:05:09 +00:00
reimar
6a956da665 Get rid of some of the more excessive () and casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25521 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-24 15:56:33 +00:00
reimar
4cc00dc192 Finally replace get_uint?? by AV_RL??
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25234 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 15:12:05 +00:00
reimar
8da10f7b0f Get rid of annoying, space-wasting sizeof(uint32_t)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25233 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 15:01:55 +00:00
reimar
18499a94d9 Bigendian fix for ogg in AVI
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25232 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 15:00:22 +00:00