Commit Graph

192 Commits

Author SHA1 Message Date
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
reimar 0034f7802d Use a loop instead of doing the same thing three times
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25231 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 14:58:00 +00:00
reimar 744797543e Use a pointer variable for extradata to simplify init_avi_with_ogg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25230 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 14:55:58 +00:00
reimar 9816936cb6 Create correct extradata for vorbis audio when used as avi sub-demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25227 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 14:09:48 +00:00
reimar 7eb46c40d3 Fix some typos in comments, grammar is still bad.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25226 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 13:50:30 +00:00
diego 6f75e1216c Remove redundant variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24164 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:02:16 +00:00
diego 22fc24fe56 cosmetics: misc typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-28 14:28:38 +00:00
reimar f322399e38 Remove extern index_mode, it is already in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23886 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 21:00:33 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
reimar f060263337 Reuse AV_RL macros in ogg demuxer instead of its own overcomplicated implementations of it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-17 13:07:15 +00:00
reimar 1e4b9a95b7 Ignore comments where no '=' follows the comment name (otherwise
"album_ja=..." would result in "Album: ja=..." MPlayer output).
Patch by Nicolas George [nicolas george [at] ens fr].
See thread: "[PATCH] Equals in Ogg comments", Mon, 5 Mar 2007 10:50:02 +0100


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23280 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-09 20:10:14 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
reimar ca95de6acd Simplify demux_ogg to use the sub_clear_text and sub_add_text functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21846 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:19:15 +00:00
reimar 0a6856d341 Simplify after last demux_ogg commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21830 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:03:58 +00:00
reimar 50dc3ce2c7 Do not access ogg_d->subs after freeing it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21829 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:02:18 +00:00
reimar 6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
reimar 83916cab7f Remove condition that should always be true
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:49 +00:00
reimar a8bf24702b Fix crash in ogg demuxer uninit with -aid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:09 +00:00
nicodvb 4a5164d995 made vorbis_info a member of ogg_stream rather than ogg_demuxer;
this change paves the way for multi audio track support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 20:53:05 +00:00
reimar 28564d6355 vorbis_comment is only used locally, move it out of demuxer struct
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:51 +00:00
reimar 6fb4b1b30a Remove unused ov_struct_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:01 +00:00
reimar a4147be5f7 Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.
Code still seems wrong to me for multiple audio tracks, since there is
only one vorbis comment/info entry for the demuxer, not one per track?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:46:50 +00:00
reimar e22ab31677 10l, compilation error in r21054
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:35:39 +00:00
reimar b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar 8f14f6d551 Make -slang work again, sub->id is -2 by default, so -slang would be ignored
with old code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:38:37 +00:00
reimar ceecfca462 Create a sh_sub_t for ogg subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:12:46 +00:00
reimar ec9819db2c Make sure we do not read beyond end of subtitle packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20510 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 13:17:26 +00:00
reimar 64e9d8fc97 realloc subtitle buffers since subcp_recode might have decreased their size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20509 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:44:15 +00:00
reimar 7d91ecbd14 Support new flac-in-ogg, fixes bug #229
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20505 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:05:49 +00:00
reimar e87a925c4a Remove #ifdef HAVE_FLAC, it was never needed and nowadays is never defined.
Fixes http://samples.mplayerhq.hu/ogg/old_flac_in_ogg_flac_1_0_4.ogg


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20335 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 17:58:33 +00:00
reimar 325912bf97 redone subcp_recode: get rid of static buffer, skip lines that failed to
convert instead of removing all remaining lines and remove subcp_recode1
since subcp_recode should now work just as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 16:09:59 +00:00
diego c7ee94590a Support for variable fps OGM files, blessed by Moritz.
patch by Sergey Khlutchin, Elphel, Inc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19808 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 09:00:10 +00:00
nicodvb 244d6ad8e8 in fixup_vorbis_wf() set to 0 bitrates indicated as -1 (unspecified, according to the specs); patch by Andrew Savchenko - Bircoph list ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19700 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 20:18:42 +00:00
reimar ccf75d6711 Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:17:04 +00:00
diego 67c9657f5d Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
inspired by a patch from Emanuele Giaquinta, emanuele.giaquinta %@% gmail.com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19332 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 21:19:06 +00:00
reynaldo 15e8c12de2 marks several strings inside structs as const when they hold just
read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c 
to cope which the changes.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-16 01:40:24 +00:00
reynaldo 1a16cbfec3 marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
diego a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +00:00
diego 7844cbc3ce Move conditional compilation into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18927 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 13:09:45 +00:00
reynaldo 8f65768bf2 rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 13:21:54 +00:00
reimar e261eefda0 Fix crash with all audio-only ogg files, the vorbis_info struct is not
stored in the sh_audio context but in the demuxer priv element


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18740 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-17 15:01:43 +00:00
uau 6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
nicodvb 7535dc582a moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by other demuxers when libogg and/or libvorbis are missing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18670 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:43:23 +00:00
nicodvb d96e0e658a support for vorbis in mp4/mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:30:06 +00:00
nicodvb 068fffa36a first vorbis packet before vorbis_synthesis_headeri() must have b_o_s==1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18638 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 22:40:40 +00:00
rtogni 9da9317579 Fix potential integer overflows in memory allocation.
Patch by Rich and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
rfelker 2539dc0417 accidentally committed this overflow fix with the declaration fix before.
messed up indention corrected at oded's request. :)
10^100l to me too..


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18469 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 06:12:25 +00:00
rfelker e70c326727 10^100l c++ declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18466 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 05:48:16 +00:00
nicodvb 5d2679c504 unbind demux_ogg from ad_libvorbis; this permits to use -ac ffvorbis without crashes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18431 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-10 22:54:24 +00:00
reynaldo 3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
diego a33158d60d Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +00:00
diego eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
reimar e078b7a14e in demux_ogg_read_packet initialize data to whole packet, reduces code and
fixes missing initialization in else + header packet case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-08 22:23:21 +00:00
corey 1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar f8c0e0cf04 fix crash with invalid -vid and no audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17219 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 11:55:47 +00:00
rathann d5505c8f9e fix
demux_ogg.c:371: warning: implicit declaration of function '_ilog'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17091 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:25:31 +00:00
diego 36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
reimar 4e76145381 Speex support. Seeking and pts generation does not work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16916 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 11:58:25 +00:00
reimar 754c2b98ef Fix two (loosely) related bugs: massive A-V desync with -audiofile (bugzilla
bug #375, sh_audio->delay must only be set when seeking, not at every packet)
and not switching to the next file when seeking hits eof.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16885 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-01 16:12:53 +00:00
reimar 2912984517 move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
reimar 169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
rtognimp 2b04744d21 Don't pass NULL pointers to demux_info_add()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16605 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-26 20:13:10 +00:00
alex 00857cf5ce Disassemble comments and pass it to the demux_info interface
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16538 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 22:52:03 +00:00
ods15 d620029e4b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
nicodvb a2ac4cd246 prevent possible exploit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15427 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-13 00:00:54 +00:00
nicodvb a66c45716a fixup the correct sh_a
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15425 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:27:22 +00:00
nicodvb 15ba985140 fixed too few parameters to mp_msg(); silence compilation warnings, removed unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15424 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:12:27 +00:00
nicodvb da2a598d9d don't call fixup_audio if there's no audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15423 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:01:52 +00:00
nicodvb 3d450d0389 vorbis extradata is now passed from demuxer to decoder in matroska's way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 17:35:58 +00:00
reimar 83d4f16ae5 Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-02 07:59:12 +00:00
mosu 9e5531f861 Nasty workaround for codec initialization data. In _at least_ one case (AAC) the stream_header.size element seems to be four bytes off. Skip those bytes but only for known cases (again AAC) and not for all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15314 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 10:40:42 +00:00
rfelker 4eb1b755bb Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store
vorbis-in-ogg-in-avi. Of course this failed miserably, but they used
the audio format tag 0xfffe for "extended" to do this. Later someone
working on MPlayer somehow decided 0xfffe was the format for vorbis,
which is nonsense, and now that's conflicting with real wav files with
extended audio format. This patch changes demux_ogg (and mkv) to use
sane fourcc's for vorbis and theora and gets rid of the 0xfffe
nonsense so hopefully wav files with extended audio will work now.
If there are problems, we'll have to find workarounds...and drive an
18-wheeler full of cola thru the house of whoever wrote this 0xfffe
nonsense in MPlayer to begin with...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14844 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-27 18:11:17 +00:00
henry 3d602b653c Theora fixes:
- do not use negative stride (fixes -vf pp crash)
- pass true image dimensions to VO, not the aligned ones (fixes incorrect
aspect ratio bug & black bar under video)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14764 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 19:18:45 +00:00
reimar 02f5ebf1d5 Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-06 10:30:10 +00:00
mosu 3de4b2a2d5 More user-friendly stream, -xid and -slang info output even in non-verbose mode part 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14575 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-22 14:28:23 +00:00
mosu 1d60bf5454 More user-friendly stream, -xid and -slang info output even in non-verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14563 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-21 18:55:01 +00:00
reimar e7568f0179 100l, completely broken pointer arithmetic causing crashes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14536 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-19 12:12:36 +00:00
mosu 50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
mosu 9ea3354fbf Fix member alignment for usage on 64bit processors.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13882 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-05 21:40:34 +00:00
mosu 6bc7b34350 Declare a prototype for the function before it is used. Otherwise some compiler versions will "optimize" them away, and linking will fail.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13804 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 08:42:25 +00:00
reimar 82f168a4f6 some memory leaks fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13642 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-14 15:09:35 +00:00
joey c9040923b7 show ogg subtitle language on OSD, if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 14:00:49 +00:00
joey baef32bc2c fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 13:51:20 +00:00
mosu bddf8c6c27 Do not use globals. Put the variables into the appropriate demuxer struct instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:20:24 +00:00
joey 1b8e3babb8 moved combined vobsub_lang into sub_select
add support for dvd subs and ogg subs into sub_select
document sub_select
vobsub_lang left as a link to sub_select for backwards compatibility


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13090 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-22 18:47:48 +00:00
reimar 57b8d5c7f6 fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-28 12:40:35 +00:00
mosu e9ff38d39b The granulepos does not depend on the number of channels, only on the sample size. Patch by Wolfram Gloger (wmglo at dent dot med dot uni-muenchen dot de).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12704 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-27 13:55:40 +00:00
henry c1f6ffe35d ENCA support (http://trific.ath.cx/software/enca/)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 17:52:25 +00:00
mosu 7ca187a068 Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12435 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-07 08:31:39 +00:00
mosu 885ed6c52f Be more verbose and tell the user which subtitle stream has been selected (if any).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12431 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-05 21:05:36 +00:00
mosu 9318af9842 Leave the subs uninitialized and not "forcefully off" if the user hasn't chosen a stream with -sid. If he used -slang then we need the comment packet which might be found after demux_ogg_open has finished.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12352 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-29 21:01:09 +00:00
rfelker ebfa939727 1000000000000l to bunkus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12266 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 22:30:18 +00:00
mosu 3d2d5a763f Clear subs in broken OGM files (those without empty subtitle packets) a bit later in order to avoid flickering if there are more subs following immediately. Patch by Michael Reinsch <mr at uue adot org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12265 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 16:36:33 +00:00
mosu a965ebf6b2 Much improved seeking. Patch by Michael Behrich <behrisch at informatik adot hu-berlin anotherdot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12264 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 16:31:30 +00:00
mosu 6a34e840e9 Changed -sid/-aid/-vid to be zero based and select the n'th stream of its type, e.g. -sid 1 will select the second subtitle stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12136 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-06 06:36:46 +00:00
mosu cecfdb8276 Support for selecting subtitles with -slang. Patch by Andriy N Gritsenko <andrej at lucky onedot net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12105 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-02 19:20:34 +00:00
mosu c4105bb731 Cleanup and small improvement in seeking if the final_granulepos is known. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11899 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-31 09:38:01 +00:00