Amar Takhar
b5972d6f14
Translation system changes part 1: wrap translated strings
...
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
Uoti Urpala
53eeb0e412
Merge branch 'ordered_chapters'
2009-04-08 02:43:44 +03:00
Uoti Urpala
f12c83b85b
Change demuxer_seek_chapter() parameters
...
Remove the "num_chapters" and "mode" parameters that aren't needed by
any callers. Change "float *seek_pts" to "double *". Allocate the
string returned via "chapter_name" with talloc.
2009-04-02 06:51:26 +03:00
Uoti Urpala
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
reimar
20a4844e80
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
...
created that matches the user-requested one.
Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29095 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 11:21:18 +00:00
Uoti Urpala
4b33422c7b
Allocate struct demuxer with talloc
...
Makes it possible to add data to it without explicit freeing code.
2009-03-21 05:42:41 +02:00
Uoti Urpala
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
reimar
601d694829
Remove native nuv demuxer, it only needs more code to achieve the same thing
...
as the libavformat demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 13:11:37 +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
e62517ef6a
Merge svn changes up to r28065
2008-12-02 18:02:05 +02:00
diego
c612907d1c
MNG demuxer by Stefan Schuermans, stefan blinkenarea org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 13:22:34 +00:00
Uoti Urpala
0a674354b7
demux: Reset demux stream 'eof' flag after packet buffer overflow
...
The eof flag is set when another demuxer stream has hit the limit on
the size or count of buffered packets. This makes sense because in that
error situation the calling code can not rely on being able to demux
more packets from this stream, so it should rather exit or whatever
instead of getting stuck trying. However the situation can improve if
packets are demuxed from the other stream. In that case the eof flag
should be cleared. This commit adds code to clear the flag if
something is successfully read from the stream (so it's only cleared
if a caller tries to read packets despite the flag being set; that's
enough to fix audio sync issues after video packet buffer overflow).
2008-10-04 07:37:18 +03: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
e98e792843
10l: MUSEPACK --> CONFIG_MUSEPACK
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 11:19:54 +00:00
diego
141e81cce4
Rename a bunch of miscellaneous preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
diego
0a749ffdc5
Rename preprocessor directives related to image libraries.
...
Change a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 08:47:51 +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
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
Uoti Urpala
2d4656e070
Merge svn changes up to r27332
2008-07-21 15:03:49 +03:00
reimar
4153f4e21c
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
...
FF_INPUT_BUFFER_PADDING_SIZE.
Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it
is big enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 17:14:12 +00:00
Uoti Urpala
68e70b3ec3
Merge svn changes up to r27092
...
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
2008-06-17 05:04:32 +03:00
diego
437b206595
cosmetics: Remove useless parentheses, align.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27091 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 17:33:55 +00:00
reimar
80141566b6
Support NULL name parameter for demuxer_add_chapter.
...
Patch by Anton Khirnov [wyskas gmail com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27089 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 15:53:28 +00:00
diego
b01b384616
cosmetics: Break overly long lines.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27088 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:54:28 +00:00
diego
ed59b9030e
cosmetics: indentation, whitespace changes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27087 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:11:14 +00:00
diego
005cf981d4
cosmetics: consistent * placement
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27086 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 12:04:58 +00:00
diego
d77499b1fe
cosmetics: one more if brace placement fix
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 11:35:20 +00:00
diego
0d9f0ba013
M-x untabify
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27084 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:52:39 +00:00
diego
057924754d
cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:50:53 +00:00
diego
8cf83f75ee
cosmetics: Split/join multiline statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:49:40 +00:00
diego
11b1a351b3
cosmetics: Consistently format all if, for, while constructs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27081 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 10:31:05 +00:00
diego
f306f79bd0
Remove one more commented-out line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27080 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:51:40 +00:00
diego
90ff0f7dcc
cosmetics: Make all function declarations consistent by moving the opening
...
braces to the next line and breaking long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27079 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:22:41 +00:00
diego
939ee3203a
Remove one more commented-out line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27078 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 09:20:59 +00:00
diego
14ecf4cdb9
Remove pointless comments and commented-out code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27077 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 08:57:47 +00:00
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03:00
nicodvb
e14b550cf6
added and reused demux_flush() instead of emptying the demux_stream buffers;
...
patch by Bryan Henderson - giraffedata gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26958 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-02 10:17:48 +00:00
reimar
cc6c63c03c
Initialize sh_audio/sh_video->ds
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:35:38 +00:00
reimar
ff6007357f
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26907 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:33:13 +00:00
reimar
fba4b13c9b
Cosmetics: simplify
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26906 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:30:20 +00:00
reimar
158b5133ff
Move native musepack demuxer further down in demuxer list
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26905 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 17:27:06 +00:00
diego
c4f6f66f9e
cosmetics: Remove pointless parentheses from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:41:00 +00:00
Uoti Urpala
0e757bf9da
Remove _s/_st suffix from some struct names
...
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03: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
9b06b5ed85
Move correct_pts to options struct
2008-04-23 13:41:05 +03:00