Commit Graph
30094 Commits
Author SHA1 Message Date
compn d47cd2aa67 change bandwidth value to bandwidth bytes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30135 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 13:43:03 +00:00
cehoyos ed4dbd3cbd Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:49:08 +00:00
cehoyos d79daa2736 Revert r30100: It breaks some mov and asf samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:39:26 +00:00
diego f20cd805ec Remove unused variable, fixes the warning:
libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 12:05:20 +00:00
compn 0c6287921f add lavc yuv rawcodecs to codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30131 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 20:57:03 +00:00
reimar ca2af2d0e7 Add support for parsing audio streams (though should be easy to extend to video)
via libavcodec.
Parsing can be done at the demuxer stage (currently disabled) or at the decoder
(ad_ffmpeg, enabled).
Should allow using the libavcodec AAC, DTS, ... decoders independent of container
format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 15:28:01 +00:00
reimar bcda7b2f99 Remove currently unneeded members accidentally added in the last revision.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:42:37 +00:00
reimar 52dab179cb Introduce a sh_common struct that contains the parts in common by the audio, video
and sub "stream headers".
One reason for this is to help avoid/make more obvious things like members with
the same function but different name (extradata vs. codecdata etc.), or members
with the same name but different semantics (pts for audio vs. pts for video).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:40:56 +00:00
reimar 4fbcbaacbc Remove one more incorrect direct ass.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:35:09 +00:00
reimar 51e55db62e Move do_render_osd function to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:31:13 +00:00
reimar a5ee26b559 vo_x11_classhint name argument should be const, since we pass string constants there.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:19:48 +00:00
reimar 467013ecdc Return the actually playing audio/video id for get_property, not the one
selected e.g. via commandline (which resulted in -1 being returned most of
the time).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30124 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:13:06 +00:00
kostya 96a73a2d7d lavc Interplay Video decoder now supports 16-bit mode too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30123 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:09:38 +00:00
reimar eac140b748 Subtitle are now also available without video, so remove that
check from the subtitle property handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30122 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:07:29 +00:00
reimar 97ed05be95 Use the same condition to decide if the audio/video id property is
not available for all commands (get, set and print).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30121 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:06:47 +00:00
reimar ea54d1771f When setting audio or video track make sure we will not try to
dereference a NULL pointer, e.g. because there is no video stream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30120 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:02:20 +00:00
reimar 6838445737 Print a ANS_ERROR reply if one of the *_property slave command fails.
Based on patch by Adrian Stutz [adrian sttz ch].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30119 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 13:56:51 +00:00
reimar 3241bdffd6 Set some freed pointers to NULL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 12:07:14 +00:00
reimar 487ddca70c Free playtree_iter upon exiting MPlayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 12:04:48 +00:00
reimar afc5a627d8 Support mp_image with allocated palette.
Fixes playback and a memory leak for FFmpeg codecs which use reget_buffer
with paletted data, e.g. cdgraphics.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30116 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:51:19 +00:00
reimar bd06a94738 Remove only use if MP_IMGFLAG_RGB_PALETTE to allow giving the flag a slightly
different meaning.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30115 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:33:45 +00:00
reimar 929a159f69 Restore the old value of planes[1] in vf_palette at the end to ensure
we do not call free() on the fixed gray_pal array.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30114 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:11:41 +00:00
jrash 48b88b30e0 sync with en/mplayer.1 r30075
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30113 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 02:35:36 +00:00
reimar e0423842de Fix grammar/missing verb in description.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 09:03:02 +00:00
reimar 57963ac45d Remove unnecessary entries from extension_table, these formats are already
in the lavf preferred_list, and thus will be handled by lavf immediately.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30111 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 08:55:36 +00:00
reimar d7549acc01 Add a (unfortunately rather long) explanation on how and when to use it
to the file extension -> demuxer mapping list.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30110 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 08:48:57 +00:00
compn c0aeb1c1c7 force cdg to lavf demuxer in extensions.c, misdetected as mpeg otherwise
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30109 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 18:20:03 +00:00
reimar a3e355babf Revert renaming of process_force_style to restore compilation against
Ubuntu's libass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30108 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:56:25 +00:00
reimar 6023874828 Some ugly hacks to make compiling against a newer external version of libass work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:51:24 +00:00
reimar 1414f844c5 rename process_force_style to ass_process_force_style to match the API
as newer libass versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:45:05 +00:00
reimar 2908957147 Remove more direct includes of libass/ass.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:26:29 +00:00
compn a0601ed256 create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 04:36:04 +00:00
kostya 8eaf81f676 Register lavc Aura 2 decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30103 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-23 16:11:48 +00:00
kostya 7055e3cd05 Register lavc Aura decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30102 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-23 13:44:23 +00:00
diego dfe6cfd967 Allow passing variants of "mingw32" as system name to --target. This ensures
backwards compatibility after switching from "mingw32msvc" to "mingw32".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-23 10:21:53 +00:00
cehoyos 468d5f2e0a Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-22 20:56:59 +00:00
ramiro 34fb57ce56 Remove parameters no longer used in h[yc]scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30099 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:59:34 +00:00
ramiro 767326f484 Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30098 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:54:59 +00:00
ramiro 0ebdb661a6 Rename function pointers used to convert from the input pixel format to the
intermediate YV12 to a more descriptive name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30097 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:41:29 +00:00
ramiro 342009a438 Check if chroma horizontal scaler is needed in sws_init_swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:34:45 +00:00
ramiro 779c4a0df5 Remove unused fields from SwsContext.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30095 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:30:55 +00:00
diego 61f34a8101 Do not auto-generate the C code to handle PCI vendor and device names.
This part of the code does not change so there is no point in generating it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 21:11:39 +00:00
gpoirier 7810431c02 sync w/r29731
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30093 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 20:57:44 +00:00
diego d9ea2f0d0e Remove unused debugging output about total number of printed lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30092 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:56:18 +00:00
diego db1d7210db Employ slightly better variable names for output files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30091 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:36:30 +00:00
diego 3a4525bfc2 Eliminate completely pointless print_includes function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30090 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:32:25 +00:00
diego 4e18fed064 Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target.
The former is the official name used by the MinGW project.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:12:20 +00:00
diego 48ed8799ac Do not autogenerate vidix/pci_names.h.
Its contents is always the same, so there is no point in generating it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:49:07 +00:00
ramiro 032a777827 Indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30087 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:42:35 +00:00
ramiro b8d5738c09 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30086 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:15:01 +00:00