Commit Graph

2099 Commits

Author SHA1 Message Date
diego 5351098826 Create a separate codecs.conf entry for Tremor and use it if MPlayer is
with Tremor support instead of libvorbis. Previously MPlayer would show
the same output on the console when decoding with libvorbis and Tremor.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:31:44 +00:00
diego 929dc9a8ac cosmetics: Move up uninit() to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27983 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:01:48 +00:00
diego 0ad147ed5c cosmetics: consistent function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27982 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:59:37 +00:00
diego 9e2505a3f5 cosmetics: Remove tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27981 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:58:11 +00:00
reimar 7a3fc5ad5a Use libavutil FFMIN etc. instead of defining our own variants.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27878 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 15:51:00 +00:00
reimar 9f7bae92df Avoid pointless casting of void*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27877 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 11:52:49 +00:00
diego 91c3f024a9 Fix smartblur filter crash due to missing default scaler choice;
set bicubic as the default scaler.
patch by Kurt Garloff, kurt garloff de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27838 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 21:00:12 +00:00
uau 1a089681fc vf_palette: Fix compilation after libswscale API changes
Patch from Guillaume Poirier. I didn't test the functionality of the
filter but at least it fixes compilation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-25 00:07:59 +00:00
diego 4722fa0b82 IWMMXT optimizations were removed from our internal libmpeg2 copy, so now
remove it from the library interface code as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27812 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-22 23:39:39 +00:00
reimar 57281a3170 Use av_malloc/av_free for audio-related buffers to avoid crashes due to
insufficient alignment on systems without memalign.
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-October/058743.html


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27799 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-18 18:54:05 +00:00
diego 26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
diego 6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +00:00
diego af21f25f31 Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27785 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:24:18 +00:00
diego 1a85bf593b #include necessary libavcodec header and remove duplicated struct declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27769 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 16:04:09 +00:00
diego 49faefb669 Remove useless '#undef realloc', realloc is not referenced anywhere near.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27767 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 09:04:40 +00:00
diego b282622c71 Remove duplicate extern declaration, fixes the warning:
libmpcodecs/vf_zrmjpeg.c:73: warning: redundant redeclaration of 'avcodec_initialized'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27766 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 08:56:48 +00:00
diego b9ce738825 Remove unused variable ncomps.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27765 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 23:10:42 +00:00
ulion 78f37058ff Fix channel order for ffmpeg flac codec.
This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 07:46:20 +00:00
diego b9509b1795 Remove unnecessary HAVE_AV_CONFIG_H #define.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27726 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-07 08:25:47 +00:00
diego 526cfa28a2 Remove word size check and macro and use __WORDSIZE directly instead.
It has been done this way in libswscale for years without apparent ill effect.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27699 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 10:16:48 +00:00
rathann a5e9a8d0ca External liba52 support, part 2 of 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:32:31 +00:00
rathann d977c6e812 External liba52 support part 1 of 2.
Conditionalize enabling of some the acceleration because
liba52-0.7.4 doesn't support all that MPlayer's included
copy does.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27619 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:30:24 +00:00
gpoirier 2bfa730214 fix compilation with lavc version > r15270
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 20:01:10 +00:00
uau 923f67082e Fix compilation after libavcodec major version 52 changes
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
 - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
 - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
 - Don't set AVCodecContext->rtp_mode (already marked unused before).
 - Use ff_eval2() instead of ff_eval().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 17:02:32 +00:00
diego 3311a2ae9c Replace casual GPL notices by proper license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +00:00
diego d5f550e257 Remove outdated URL from vd_info_t struct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27533 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:16:39 +00:00
diego 5c282f9a49 Remove version information from libmpeg2 vd_info_t struct.
It is available in other places and needs to be updated continuously.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27532 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:13:44 +00:00
aurel a5f69284d9 handle the lavfpref demuxer in the same way as the lavf one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:31:53 +00:00
diego 3932c5e0b9 Remove unused static declarations, fixes the warnings:
libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used
libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 16:04:32 +00:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +00:00
diego 0a749ffdc5 Rename preprocessor directives related to image libraries.
Change a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 08:47:51 +00:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
compn ded7033671 cosmetics: reindent after last commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27399 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 18:43:17 +00:00
compn cae7631dbe change ve_raw.c:set_format to not overwrite biCompression if force_fourcc is set.
fixes -ovc raw -ffourcc
patch by "Andrew Wason" rectalogic !@! rectalogic !.! com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27398 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 18:41:43 +00:00
diego 96a506733d Change a bunch of codec-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 16:30:32 +00:00
diego 4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
diego 771cd67118 Use conditional compilation instead of an #ifdef around the whole file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 10:26:23 +00:00
diego fa164d8a94 Add Dirac video support via libdirac and libschroedinger in libavcodec.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 22:58:51 +00:00
reimar cf8d381255 Try to keep decoded audio buffer aligned.
Seems to be enough to avoid crashes (due to unaligned SSE2) with FFmpeg vorbis decoding for now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27281 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-14 16:38:58 +00:00
reimar 422c92e314 Simplify and clamp coefficient index for MS ADPCM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27270 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 10:08:40 +00:00
reimar c83dca172f 100l, fix MS ADPCM decoding for e.g. http://samples.mplayerhq.hu/mov/qtaudio/surge-2-16-L-ms02.mov
First coefficient array must be unsigned to fit in 8 bits


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27269 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 09:23:14 +00:00
reimar ed0edb61cb Make really sure channels can only be 1 or 2 for imaadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27262 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:29:41 +00:00
reimar ca588e6a9f Simplify imaadpcm return statement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:28:22 +00:00
reimar 792dc55d19 Check length of input buffer for msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27260 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:27:35 +00:00
reimar ffc22175d3 Add a comment on shift vs. division
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27259 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:00:49 +00:00
reimar 68e6f22bbc Scale msadpcm coefficients to fit into 8 bits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27258 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:59:03 +00:00
reimar 4366cc211c Simplify ad_msadpmc.c: Use AV_RL16, merge sign extension into LE_16 read and
use (int16_t) to let the compiler do the sign extension.
Reduces code size on x86_64, gcc 4.3.1 by 248 bytes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27257 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:51:12 +00:00
reimar 05deb158cf Copy macro simplification from imaadpcm to msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27256 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:36:21 +00:00
reimar 796e4a53ca Remove useless comments from ad_msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27255 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:14:16 +00:00