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
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