Commit Graph

1036 Commits

Author SHA1 Message Date
Uoti Urpala c5e462b33d build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc
together (libavutil is always required).

based on svn commit by diego:

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
Uoti Urpala 389c32b5c7 Remove MEncoder
Disable MEncoder compilation and remove files used by MEncoder
only. There's no attempt to remove all references to MEncoder from the
build system, documentation etc at this point.

Removed files: (muxers, audio/video encoders, misc)

mencoder.c
cfg-mencoder.h
parser-mecmd.[ch]
xvid_vbr.[ch]
libmpdemux/muxer*
libmpcodecs/ae*
libmpcodecs/ve*
libmpcodecs/native/rtjpegn.[ch]
libmpcodecs/native/mmx.h   // was used by rtjpegn only

Rationale:

MEncoder is still useful for some people, but there's not much
potential for further development; in the long run almost all use
cases can be handled better by solutions based on something else (for
example using FFmpeg or encoding MPlayer output). FFmpeg is already
getting video filtering support which should work for some common
MEncoder uses.

Keeping MEncoder working takes extra work that is away from player
development. While that amount of work is not huge (mostly MEncoder
can be just ignored), it's not completely insignificant either.

MEncoder is still maintained to some degree in the svn tree, so if
necessary it's possible to use it from there for now. This tree has
never had major improvements for the MEncoder side, so using svn
MEncoder instead should be no major loss.
2010-11-02 04:16:55 +02:00
Uoti Urpala 62112dedb0 enable vo_mga, vo_xmga, vf_palette, vf_halfpack
Nothing should depend on libswscale internals any more, so re-enable
everything. vf_palette and vf_halfpack were actually fixed earlier but
were not properly enabled.
2010-11-02 04:16:45 +02:00
Uoti Urpala a92b4adf61 Makefile: remote obsolete dep/depend targets, mark "locales" phony 2010-11-02 04:15:50 +02:00
diego ed3a57ae28 Makefile: Move header compilation rules to the bottom of the rules list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32042 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:50 +02:00
diego e66b13ab65 Makefile: remove distclean hack for dependency files
Remove hack that skips including dependency files on distclean.
Now that dependency files are generated as a sideeffect of compilation this
workaround is no longer needed since distclean no longer tries to create them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31969 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego 578ad534b3 configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 96c17fe68b subs: Add support for PGS subtitle decoding via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 6c3c1588f5 libgsm: Remove libgsm wrapper
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:22 +02:00
ben 6704008a46 stream_bluray: add unencrypted Blu-ray playback
Support for unencrypted Blu-ray playback through libbluray.
Use it through: mplayer br:////path/to/disc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 95751ea3e4 Windows support: add a manifest file
Add a manifest file to disable file and registry "virtualization" on
Windows.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31630 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego 853dc929e4 configure: Separate dependency flags from general CFLAGS
Before, there was an unfortunate interaction with 'make checkheaders':
Compiling a .h file would generate a .d dependency information file for
that .h file as a sideeffect of compilation. Unfortunately this would
clobber the .d files of the .c files with the same basename, resulting
in broken dependency information when running plain make.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31614 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego d86aad3d56 ad_mpg123: add MP3 decoding through libmpg123
patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:46 +02:00
diego a1b8092c87 Factorize MPlayer/MEncoder version string handling.
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
diego fd7cf006b7 Makefile: Move and comment the .SUFFIXES rule
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31528 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:42 +02:00
diego 713284ea26 build: Rename configure.log file to config.log
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31415 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:08:56 +02:00
diego 8177dc6d45 Makefile: Add path.o to the dependency list of the loader test programs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31407 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
diego e6078b8f59 Makefile: Add a command to the binary build rule.
This allows running the 'tests' and 'tools' targets again.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31402 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
diego 486df78faf Makefile: Add missing '$' to EXESUF variable in binary build rule.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31401 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
siretart 082b6f86d3 vf_rgb2bgr: remove the filter
Its functionality has been superseeded by sws by quite some time, and
the "swap" functionality is now provided by vf_format.

see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for
a full discussion.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31350 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:27 +02:00
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
reimar eff2254d58 Change vo_png to use FFmpeg's png encoder instead of libpng.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:26:30 +00:00
reimar a7be2e180b Finally add matrixview vo.
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar 0ecf324ac5 Extract functions to generate yuv->rgb matrices and lookup tables into a
separate file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +00:00
Uoti Urpala dc7f183022 Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
2009-12-30 00:14:20 +02:00
Uoti Urpala 67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02: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
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
diego c3da36a9ac Run vidix/pci_db2c.awk directly instead of passing it to awk.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 14:14:56 +00:00
reimar 1f4109d85e Experimental support for external libass.
So far probably only works with the libass from Ubuntu 9.10


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:18:22 +00:00
reimar 0aac4fa9dc Add x11_common as dependency for OpenGL with X11 backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30064 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 13:46:34 +00:00
Uoti Urpala efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
reimar 5c5087081f DShow TV input needs part of the our DirectShow code, so add the proper
dependencies to the Makefile.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29985 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 17:52:18 +00:00
Uoti Urpala 1dba61a670 build: Generate version numbers for git
Update the version.sh script for git so it'll generate version numbers
more useful than "UNKNOWN". At the moment it only generates the short
SHA1 name, but adding a tag as a starting point should allow more
useful output. Rather than update the Makefile logic that tried to
guess whether the svn revision had changed since the last version.h
update, just run the version.sh script from configure so the version
is updated at least at that time.
2009-11-23 06:22:15 +02:00
Uoti Urpala 5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar 5830140582 Add preliminary support for streaming via FFmpeg's URProtocol functions.
Basic playback tested for file and http protocols.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:09:17 +00:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
cehoyos 2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
Uoti Urpala 8bbb79c03a av_log callback handling overhaul
Move av_log callback handling from vd_ffmpeg.c to a new file
av_log.c and install the callback immediately when starting the
program. Main functionality improvements of the new code:

 - The old version only installed the callback when opening an FFmpeg
   video decoder. If nothing had triggered that then av_log() messages
   from other sources (libavformat, audio decoding, swscale usage)
   bypassed MPlayer's output system completely. Now the callback is
   always installed.

 - Current av_log message severity levels are handled correctly. The
   old code used MSGL_ERR for some messages that should be MSGL_V.

 - Message type is now set for libavformat contexts
   (MSGT_DEMUXER / MSGT_MUXER).

 - The old code did "mp_msg_test(type, mp_level)" before actually
   determining the type, so that it always used MSGT_FIXME. This led
   to some messages being incorrectly dropped in case the user
   had specified module-specific verbosity levels. The old check in
   question was originally motivated by performance problems when
   there were a lot of callbacks; however it's not clear whether the
   part about it skipping the type determination was intentional (most
   of the performance problems must have come from the way the
   original code used snprintf) and in my tests current FFmpeg
   libraries have not generated unreasonable amounts of callbacks
   anyway.
2009-10-31 23:59:16 +02:00
cehoyos a9474b0b39 Move teletext specific code from stream into libmpcodecs.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
diego fc1b468117 Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:56:18 +00:00
diego da278b3184 Merge rules for building mencoder and mplayer.
Just the dependencies are different, so specify them separately.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:44:51 +00:00
diego 47f0629f1a Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables.
They are only used in one place so the indirection is pointless.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:41:35 +00:00
Uoti Urpala 0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
reimar fde99e3c5d Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
keycodes instead of its own switch-case in vo_corevideo.m


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:29:07 +00:00
reimar 0dadcc7bf0 Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +00:00
Uoti Urpala 152e480397 vf_uspp: Mark as depending on avcodec API only, not internals
There has been some confusion about whether this filter depends on
libavcodec internals or not. When originally added it included
explicit code to support building with a shared library avcodec, but
it also used the internal dsputil.h header. Later it was marked as
depending on libavcodec internals, then the dsputil.h include was
removed as unnecessary. It seems to build fine without any internal
headers now and has no obvious other usage of internal symbols either,
so I'm enabling the build whenever libavcodec is available.
2009-07-26 20:22:48 +03:00
Uoti Urpala a92a43b91f build: Readd support for code depending on FFmpeg internals
Add configure option --ffmpeg-source-dir=PATH. If the user specifies
this option then building code that depends on FFmpeg internals is
enabled and the files files which use internal lavf headers will get
them from this path. The FFmpeg libraries linked with must export
needed internal symbols.
2009-07-26 20:22:48 +03:00
Uoti Urpala 78ea550f0f build: Remove code for internal FFmpeg build
Remove some now unnecessary parts that were used for the internal
FFmpeg build, mainly configure tests for FFmpeg features and Makefile
logic for building it.
2009-07-26 20:22:48 +03:00
Uoti Urpala 546c3fb53c Remove internal libass tree
Remove the libass/ directory and use the newest standalone version of
the library instead.
2009-07-26 20:22:43 +03:00
Uoti Urpala cd4e8dc1fa Disable functionality requiring libswscale internals
The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette,
vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable
RGB support (which is probably little used). Others are disabled
completely for now.

vo_mga and vo_xmga are disabled by preventing configure from enabling
them. The rest is placed under LIBSWSCALE_INTERNALS variable which
isn't currently enabled anywhere.
2009-07-26 06:16:52 +03:00