Commit Graph

184 Commits

Author SHA1 Message Date
Uoti Urpala 5a997b8195 build: Revert "codec-cfg.c: avoid including aviheader.h"
This reverts commit 1e544365bf.

I was careless when cherry-picking the reverted commit - the only
effect it had was add an unnecessary libavutil dependency to a HOST_CC
compiled file.
2011-07-07 07:38:24 +03:00
reimar 1e544365bf codec-cfg.c: avoid including aviheader.h
Avoid including aviheader.h only for mmioFOURCC, it has too many
dependencies, including even subreader.h and via that fribidi.

This causes issues both when cross-compiling and for CODEC2HTML
compilation, so instead use avutil.h/MKTAG.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33649 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:07 +03:00
Uoti Urpala aba8a1838a video/colorspaces: add new 9/10-bit formats from libavcodec
Add new internal 9/10-bit IMGFMT values and mappings to the
corresponding libav* PIX_FMT_* values.

Partially based on a patch from Arne Bochem <arneb.mp@ccan.de>.
2011-06-26 06:27:50 +03:00
Clément Bœsch 6506d4ad84 cleanup: remove more warnings 2011-05-02 00:46:48 +03:00
Uoti Urpala 626d5ed628 vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also
depended on internal FFmpeg headers (so it would probably have been
hard to get them to compile now even if you tried). It's obsolete now,
so just drop the whole mess.
2011-01-31 16:03:11 +02:00
diego 12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
diego ed8e92afcc Remove #warning preprocessor directives
The #warning preprocessor directive is non-standard and not available with all
compilers. Furthermore, the warnings it causes are noisy and have not led to
getting any of the underlying issues fixed in the space of a decade.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32480 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:10 +02:00
reimar 569c5702b6 codec-cfg.c: Remove unused parsehtml parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31475 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:07 +02:00
reimar 65564cdf2c codec-cfg.c: Add static to functions used only locally.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31474 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:07 +02:00
reimar 2465ec9027 codec-cfg: set CODEC_CFG_MIN to the release value in codecs.conf
Auto-update CODEC_CFG_MIN value to release value in etc/codecs.conf.
Allowing them to differ causes more issues than it is worth.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31472 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:07 +02:00
Uoti Urpala 4c6e3ac01b Merge svn change r31134
Fix some search/replace errors introduced in the svn commit.
2010-05-07 22:03:48 +03:00
diego a535f7bfca the great MPlayer tab removal: part II
some extra indentation fixes are put in as a bonus


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00: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 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
diego 99c1bbca2a Add license header to all top-level files missing them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
Uoti Urpala 231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
reimar 8afc25d710 Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
to use it.
Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:45:07 +00:00
reimar a326622304 Add support for 16-bit per component YUV formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 22:53:25 +00:00
reimar cc46a64a26 Add support for 440p colorspace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 12:03:17 +00:00
Uoti Urpala b8861ce8e2 Support VDPAU MPEG4 hardware decoding
Original patch by NVIDIA.
2009-11-16 02:46:33 +02:00
cehoyos 2b93a48ac8 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
hardware.

Original patch by NVIDIA corporation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 19:11:13 +00:00
Uoti Urpala 95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03:00
reimar b6c472202f make codec-cfg reuse the proper defined constants for all RGB/BGR formats
instead of re-constructing them itself.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29501 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-12 01:04:37 +00:00
reimar a3d39e2702 100l, fix compilation again and make codec-cfg.c use the predefined constants
instead of reimplementing the IMGFMT_RGB|bit_depth logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29500 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-12 01:03:21 +00:00
cehoyos e9db7e8b4f s/RG48xE/RGB48xE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29496 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:57:22 +00:00
reimar 6960e4c1b1 Explain how formats must be ordered in fmt_list so the parser can handle
names where one matches the beginning of another.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29492 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:21:31 +00:00
reimar 8541fcf365 fmt_table should be const as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29491 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:15:21 +00:00
cehoyos a2dd68d6b4 Allow out-formats for IMGFMT_RGB48* in codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29488 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 17:54:11 +00:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
Uoti Urpala 7394680e4e Add temporary no-op translation function stubs 2009-07-06 19:56:57 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego e0b6d5d6c8 Change type of first argument of the print_int_array function from int to
unsigned int, fixes warnings of the type:
codec-cfg.c:1031: warning: pointer targets in passing argument 1 of 'print_int_array' differ in signedness


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29155 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-09 09:53:35 +00:00
Uoti Urpala b93f4b7bba codec-cfg.c: Remove bogus printf argument
Two printf calls had a bogus argument that did not match the format
string. Remove.
2009-03-07 01:08:02 +02:00
Uoti Urpala e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
diego abb8f13f7f Remove unnecessary linking hack, compilation works fine without.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28782 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 15:55:20 +00:00
Uoti Urpala 0bf2bd91ec Merge svn changes up to r28610 2009-02-16 02:39:58 +02:00
reimar 8c1978cc26 Add support for image formats and codecs used by VDPAU
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28551 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 08:29:45 +00:00
Uoti Urpala 14d3193391 Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compile
codec-cfg runs on the host system but EXTRA_INC can have target system
paths. The EXTRA_INC was added there for shared libavutil support.
Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h
(which in turn needed libavutil) instead of including the header, and
drop the EXTRA_INC flags.
2008-12-02 20:54:13 +02:00
diego 3b31fa5717 Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +00:00
diego 266f32ad0d Fix codec-cfg-test compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26880 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 09:03:18 +00:00
diego 4bcb2a5baf Add missing #includes to pass 'make checkheaders' to codecs.conf.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26364 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 15:19:55 +00:00
reimar b780832765 100l, free strdup'd strings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25691 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 14:48:12 +00:00
reimar 2f77f19cb8 Builtin codecs array can now be const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25690 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 14:07:27 +00:00
reimar d63fb8ba99 Replace the persistent CODECS_FLAG_SELECTED by a local "stringset" with
an almost-trivial implementation.
This allows making the builtin codec structs const, and it also makes
clearer that this "selected" status is not used outside the init functions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25689 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 14:05:46 +00:00
reimar f87c9296a7 Get rid of some useless extra ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25275 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 22:32:44 +00:00
diego e98794e2ee Avoid short forms; has the added benefit of allowing compilation with gcc 2.95
which complains about 'unterminated string or character constant'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24961 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 22:25:52 +00:00
diego 52fa7ffbfd Replace some Hungarian comments, thanks to Denes Balatoni for the translation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24956 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-03 14:56:26 +00:00