Commit Graph

966 Commits

Author SHA1 Message Date
Uoti Urpala a286506467 Merge svn changes up to r31176 2010-05-30 15:37:34 +03:00
Uoti Urpala 6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
Uoti Urpala d72541b75c bstr.[ch]: add new files for struct bstr related functionality
Move "struct bstr" definition from ebml.h to its own header and add
some utility functions/macros. Change length field type from int to
size_t and adjust using code accordingly.

Partially based on a patch from Anton Khirnov.
2010-05-20 23:50:18 +03:00
siretart e3f191fa3f remove vf_yuy2, functionality is replaced by -vf format=yuv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 13:49:05 +00:00
Uoti Urpala c5812d6056 af_lavcac3enc: make the filter work without FFmpeg internals
The only FFmpeg internal symbols required were some constants. Define
them in the file itself instead. Also add some checks and fixes to
make the code more robust and fix a potential memory corruption
problem.
2010-05-14 04:25:49 +03:00
diego 12f67b8372 Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
Uoti Urpala f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala 7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala 4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
reimar 7c2bef4bb5 Add sdl_common file and use it to share the input handling between -vo gl
with SDL backend and -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 08:17:23 +00:00
diego d226b09b2c Generate dependency information as a sideeffect of compilation.
This speeds up compilation times, simplifies the code and
fixes dependency file generation in libav*.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31026 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-06 10:08:19 +00:00
Uoti Urpala 97db8519c8 build: create and install .mo translation files
If --enable-translation was specified to configure, build and install
.mo files for the selected message language(s). The languages enabled
can be chosen with the --language-msg option; by default all available
ones will be installed. The .po source files for available languages
are seached under the po/ subdirectory; at the moment that
subdirectory is not included in the sources so no languages will be
enabled unless you add the actual translations before running
configure.

The .mo files are created in the locale/ subdirectory when compiling.
By default MPlayer will only look for them in the installed location,
so the newly compiled .mo files will not be found if you run MPlayer
without installing. You can set the MPLAYER_LOCALEDIR environment
variable to point to the locale/ directory to test the translations
without installing.
2010-04-01 13:09:32 +03:00
diego 85640449d2 cosmetics: Break some overly long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30963 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 12:12:25 +00:00
diego 70c66c0476 Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
diego a06a3d476d Move SetCodecPath() from loader to get_path.c and make it unconditional.
This fixes compilation with the Win32 loader disabled but other binary
codec loaders enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:27:07 +00:00
reimar a743c0a738 Split codec path related code into a separate file to fix Windows build.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 20:44:01 +00:00
Uoti Urpala f4a1d6e36e Makefile: fix %.S rule (broke loader build on x86)
The rule merged from svn used "ASFLAGS" which was set for FFmpeg
only. Change it to use CFLAGS instead (ASFLAGS is the same in svn).
2010-03-10 16:40:22 +02: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 0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala 81c4223448 Makefile: remove outdated vf_halfpack entry
Remove an outdated entry left over from when vf_halfpack depended on
libswscale internals.
2010-03-09 23:06:40 +02:00
Uoti Urpala 36e7a20e69 Merge svn changes up to r30550 2010-03-09 23:03:14 +02:00
Uoti Urpala 8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
Uoti Urpala 323890871d build: remove separate mp_msg-mencoder.c
mp_msg-mencoder.c was separate from mp_msg.c only to compile a version
without a GUI dependency when the internal GUI was enabled. Since the
GUI has been removed the same mp_msg.o can be linked in all binaries.
2010-03-09 19:10:06 +02:00
sesse 18deeb4aff Implement DirectShow filter graph.
DirectShow specifies that a filter (codec) can expect JoinFilterGraph
to be called, and store a reference to the graph manager. Implement a
very bare-bones graph manager (all functions are stubs, and no extra
interfaces are implemented) and give it to the codec on init.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30866 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-08 19:57:37 +00:00
greg ca7cbc0724 Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.

Original patch by Nicolas George. (nicolas.george normalesup.org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:13:08 +00:00
Uoti Urpala 0a2a78c62e Makefile: vf_halfpack no longer needs libswscale internals
vf_halfpack now uses only the public libswscale API, so compile it
unconditionally.
2010-02-26 17:11:04 +02:00
reimar 70647bb9cb Disable old-style implicit rules to fix MinGW/Cygwin compilation
(mplayer-rc.o can not be generated).
TO be improved or removed if/when someone figures out the issue.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30725 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-23 23:33:10 +00:00
diego 5f10e16f75 FFmpeg: Add tomi to architecture list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 17:03:28 +00:00
diego 93e9e860d7 Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].
This avoids confusion with headers of the same name in other places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30573 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 12:55:02 +00:00
diego 5b67d8bfee osdep/mplayer.rc.o depends on version.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30549 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-13 14:31:15 +00:00
diego c53143fffb Fix linking of loader test programs when loader is disabled.
Dependencies were only set correctly if the loader code was enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30542 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-12 13:45:19 +00:00
diego fde8ee073d Fix linking of mp3lib test programs when internal mp3lib is disabled.
Dependencies were only set correctly if internal mp3lib was enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30528 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-08 23:23:04 +00:00
diego 05b63e5ded Fix linking of liba52 test program when internal liba52 is disabled.
Dependencies were only set correctly if internal liba52 was enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30527 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-08 22:21:16 +00:00
komh f275d3d32c Add OS/2 KAI audio driver support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-01 14:09:53 +00:00
Uoti Urpala c710c5ee50 Merge branch 'matroska' 2010-01-28 00:56:26 +02:00
Uoti Urpala 5f631d1c08 matroska: add new parsing code
Add a new EBML parser implementation that should allow significant
improvements to the Matroska demuxer. The new parsing code is not
actually used yet by the demuxer. The only changes to existing code in
this commit are to generate the MATROSKA_ID_* / EBML_ID_* macro
definitions from the new implementation and to rename some of them
(the new implementation uses names matching the official Matroska spec).

The main parser implementation is added in ebml.c. There are two new
generated files, ebml_defs.c and ebml_types.h, that contain
definitions of EBML elements. Those are generated by the new script
TOOLS/matroska.py. There's a new Makefile target "generated_ebml" that
run the script to refresh the content of the generated files.
2010-01-27 14:26:43 +02:00
Uoti Urpala 69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar 92b91439e0 Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication,
though that is already done that way for dts support in hwac3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30280 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:43:19 +00:00
greg 9aea06cf7d Update internal libass copy to commit 8db4a5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 18:35:44 +00:00
Uoti Urpala 852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
Uoti Urpala ba21aba40d Merge svn changes up to r30187 2010-01-08 01:55:15 +02:00
Uoti Urpala b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala 231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
diego a7a1f395c6 Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it.
The shell looks for awk in /usr/bin, the path from the shebang line. However,
there exist systems with awk in /bin, namely archlinux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30216 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 21:22:33 +00:00
diego bf258cb675 Remove previous failed attempt at disabling that auto-generation of some C code.
This reverts the previous buggy commit, r30094.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30214 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:53:57 +00:00
diego a4ce4a23b7 Drop -Iloader from CPPFLAGS for the loader subdirectory.
Instead use full relative paths in #includes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:32:23 +00:00
diego cdcbe65d47 Add loader/wine/ to DIRS; its headers should be part of checkheaders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30211 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:56:28 +00:00
reimar 6da17782ea 100l, vo_png must go in SRCS_MPLAYER, not SRCS_COMMON.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:39:16 +00:00