Commit Graph

1830 Commits

Author SHA1 Message Date
reimar 4199378edd Implement FIXME: Restore original width/height when CODECS_FLAG_ALIGN16
is set and codec init failed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22030 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 15:29:07 +00:00
diego 4f9a4a72c9 Fix FSF address and otherwise broken license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21995 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 08:02:06 +00:00
reimar 4b9ddc69a0 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 15:44:58 +00:00
reimar 63b14952d2 Another AVCodecTag compile fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21981 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:49:08 +00:00
reimar db6e74fe44 BE_32 -> AV_RB32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21964 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 23:15:53 +00:00
nicodvb bb9bd19bc8 include the right riff.h according to USE_LIBAVFORMAT_SO|USE_LIBAVFORMAT; please stop breaking code that uses *_SO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21962 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 01:19:02 +00:00
reimar 0c8d9ba25f Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three
different places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:28:11 +00:00
reimar a52c97540c Include libavformat/riff.h when building with static libavformat and
add and correct prototypes if not.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 14:40:05 +00:00
ben fde73bb200 allows OSD menu to be displayed when using MPEG PES video out
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21821 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-04 16:46:15 +00:00
rathann c0926ecd8e Fix build with shared libavutil. Approved by Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21794 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 02:44:54 +00:00
michael 6f0e3fb15d the avi spec does not allow random samplesize whoever wrote this should be shot
also block align should be equal to sample size
i dunno if this breaks anything but the old code was definitly not correct
this also fixes amr_nb muxing (in .3gp with lavf for example)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 20:40:19 +00:00
michael 8f7f2ad9e0 first step toward amr-nb muxing support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 18:56:28 +00:00
diego 2240156c34 Properly fix compilation without code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21746 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 22:35:46 +00:00
rik cf122d037c compilation fixes: define always_inline and don't use uint64_t_C
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21740 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 13:18:43 +00:00
gpoirier c5c8169b47 Pass quant tables to next filters
Fix problem when softskip is before pp. It disabled the pp filter (with no warning), since pp needs the quant tables.
pach by Trent Piepho % xyzzy A speakeasy P org %
Original thread:
date	Dec 5, 2006 11:40 AM
subject	[MPlayer-dev-eng] softskip doesn't copy quant tables


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21714 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-21 14:59:39 +00:00
nicodvb cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
reimar 8e1126d26e Simplify: get rid of useless lame_presets_longinfo_dm function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21638 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-16 20:02:26 +00:00
reimar c66f1237a5 Fix FIXME mp_msg levels and targets
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-16 19:59:37 +00:00
reimar f4b7a0e4d1 Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed
ASAP, too, though


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-12 20:29:30 +00:00
henry e0ea1f7c69 count needs to be even
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21594 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-11 18:50:52 +00:00
reimar 81b668d7ed Only increase buffer size to avoid crashes when seeking in
multi-resolution video files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21579 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 18:59:28 +00:00
reimar b5b3b6a41a Fix realvideo size changes by using our own malloced buffer and export type mpi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21575 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 16:52:58 +00:00
reimar 6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
eugeni e15d11c89e Speed up ASS subtitles display by detecting changes between two consecutive
rendering results.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21522 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 18:44:26 +00:00
reimar dd4bc17421 Fix memleak in theora decoder due to missing theora_comment_/theora_info_clear on uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21515 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:42:30 +00:00
reimar 10021f03bc Fix memleak if vd_ffmpeg init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21514 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:41:34 +00:00
reimar f56fcffcfd Remove unused function pointers, they probably had incorrect prototypes
anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21482 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 21:43:57 +00:00
reimar 6d0d8d71f8 Compile fix, BE_32 definition has been moved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21473 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:46:37 +00:00
diego 60a8769850 Remove long-deprecated -vop option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21446 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 17:32:53 +00:00
eugeni ac93dafe54 Set video aspect ratio for libass in vf_vo.
This was lost when ass_configure was split into smaller functions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21443 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 17:04:01 +00:00
diego 32356a5c81 Update comment, video output plugins are deprecated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21442 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 16:49:13 +00:00
reimar 8a5725ccad Cleanup and fix rectangle size calculation, caused crashes with e.g.
-vf rectangle=0:0:0:0


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21417 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 17:51:44 +00:00
diego b125a9e129 Add libav include paths to CFLAGS without indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
diego cc3583a822 Explain reason for -I.. in CFLAGS here.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21389 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:10:11 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
diego 8d5aea5655 cosmetics to ease future patching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21345 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:52:31 +00:00
diego f415c639b9 Move common code to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:32:24 +00:00
diego 1737003543 Use standard SRCS2 name for MEncoder sources.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21304 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:53:05 +00:00
diego e6b3cc9b3d Move common code for generating multiple libraries to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21303 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:40:39 +00:00
diego efdfddb032 Merge duplicate entries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21297 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:58:28 +00:00
diego 21207386d2 Remove unnecessary variable indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21296 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:53:57 +00:00
diego 22b2ea52a8 cosmetics: alphabetical order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21292 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:47:32 +00:00
diego a46183fb2c FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:37:03 +00:00
diego 604254a157 100l typos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21290 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:13:46 +00:00
diego 272a50f003 Remove useless variable indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21289 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:11:46 +00:00
diego 59903e12fa cosmetics: Move around some entries for better readability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21288 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:11:07 +00:00
diego 16c5080dd8 Do not use many different variables for SRCS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:02:52 +00:00
diego 45d5e76615 Reorder entries for better readability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21286 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 21:55:40 +00:00
diego 5442528a6a Remove unused include variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21285 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 21:30:17 +00:00
uau 55b5bb3a5e Fix previous broken vd_qtvideo.c commit which failed on MACOSX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21280 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 19:35:56 +00:00
uau cb2cfdd31c Move #include <QuickTime/ImageCodec.h> before internal headers
to avoid #define of always_inline which would break it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21279 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 19:19:00 +00:00
uau 3f7645a3b1 Shouldn't move "#ifdef MACOSX" before #include config.h of course...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21276 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:27:42 +00:00
diego dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
uau 7ecf9d9e29 Move #include <QuickTime/QuickTimeComponents.h> before internal headers.
It was probably broken by #define always_inline in ffmpeg headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21274 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:06:11 +00:00
reimar 690fb7a8e1 Fix incorrect use of be2me_32 on a pointer, use BE_32 instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21267 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:26:21 +00:00
reimar e85f73f7fb Useless use of strstr, strchr is good enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21259 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:12:46 +00:00
henry e56c8ee2d0 Check the log level before processing the message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:08:40 +00:00
diego 7cce9019a7 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21244 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:45:03 +00:00
reimar 2c847e0b06 Remove useless libvo/sub.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21240 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:20:09 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego c64125cf0b Rename CONFIG_MP3LAME variable, the variable for LAME support in FFmpeg
had the same name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21196 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-24 23:32:39 +00:00
uau bd1989db0e Fix incorrect function pointer definition.
No call was made using this prototype directly so this just fixes
compiler warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21179 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:33:30 +00:00
uau 544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
eugeni 6e736f6cac Fix incorrect stride used in vf_ass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21170 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 17:00:03 +00:00
kraymer c47df473f9 MSGTR for libmpcodecs/vd.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21161 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 09:26:58 +00:00
diego d52d16f96e Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
gpoirier dbbe73116c allows to de- and reactivate yadif on the fly
Patch by Carl Eugen Hoyos % cehoyos A rainbow P studorg P tuwien P ac P at %
Original thread:
date: Nov 17, 2006 7:38 PM	 
subject: [MPlayer-dev-eng] De- and reactivate yadif


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21076 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 19:17:51 +00:00
diego a7c46b9025 Remove obsolete Xvid 3 support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21000 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 02:40:19 +00:00
reimar 7b25afd742 Add deinterlace property, patch by Carl Eugen Hoyos
(cehoyos [at] rainbow studorg tuwien ac at) with small modifications
by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:16:21 +00:00
reimar 7df98a0a3d Put files fully owned by my under GPL v2 "or later"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:03:33 +00:00
gpoirier 1fcaa00c85 Fix AMD64 support, patch by Reimar Doffinger
Original thread:
subject: Re: [MEncoder-users] pullup filter segfaults on amd66
date: Nov 13, 2006 4:07 PM


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20977 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 08:36:10 +00:00
gpoirier 4be2ac6d78 Fix segfault with videos with unusual resolution, patch by Stanislav Maslovski % stanislav P maslovski A gmail P com %
Original thread:
date: Nov 15, 2006 10:38 PM	 
subject: [MPlayer-dev-eng] [PATCH] vf_screenshot.c: segfault (buffer overflow)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20946 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 21:52:34 +00:00
rtogni 88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
uau 45200bc6df Use vf control for reading pts from vf_vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 14:02:55 +00:00
uau a703241aa9 Update OSD contents only after the correct values for the frame are known.
The most visible inaccuracy caused by the previous update location was
that the OSD always showed position 0 after seeking with demux_mkv.
Split frame decoding and filtering because with -correct-pts the pts
value that should be displayed for the frame is only known after
decoding but is needed before filtering (during which the OSD is drawn).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:29:20 +00:00
diego 63d6209c7a Remove mmx.h, the licensing status was doubtful, and put a minimal
replacement header in the place where it's needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20837 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 16:42:04 +00:00
diego 7accc82228 Separate XviD 3 and XviD 4 tests.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:35:32 +00:00
corey da8cb27dbd support lavc mblmin and mblmax
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20772 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 03:22:03 +00:00
uau 0d8f9453b5 Fix code that cuts audio data if the filters produce too much.
It incorrectly used the channel count and sample size values from the
decoder even though the filters can change those.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20768 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 23:16:55 +00:00
michael 3c49701490 feed av_log() through mp_msg()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20757 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 19:52:47 +00:00
diego 3829ecb1a2 Remove remnants of long-gone libfame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 22:57:14 +00:00
eugeni aca2396794 Initialize fontconfig in VFCTRL_INIT_EOSD handler.
Recent libass api changes moved fontconfig initialization to filter's
config() function. It is bad, because cache update can take a long time,
resulting in unpleasant sound effects. This change restores the original
behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:56:31 +00:00
reimar 30bb00bf15 Fix comment, it's 'sowt', not 'swot' ('twos' reversed)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20720 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:40:16 +00:00
reimar 710879686b Always respect w and h params to mpcodecs_config_vo over
sh->disp_w and sh->disp_h, otherwise it will break when the
resolution changes mid-stream, like in
http://samples.mplayerhq.hu/MPEG2/res_change_ffmpeg_aspect.ts


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20687 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 12:10:44 +00:00
reimar 1fd844ab06 ass renderer absolutely needs readable target mpi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20672 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 20:48:15 +00:00
henry 3a0f1fa219 changed email address
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20662 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 10:21:52 +00:00
henry d4f2e185b4 pass the interlacing info to the filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 07:08:54 +00:00
eugeni 6fef7a200f Introduce MSGT_ASS, use it for all libass messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 18:15:33 +00:00
reimar 6083bf7270 Set mpi stride, mostly fixes http://samples.mplayerhq.hu/MPEG2/res_change_ffmpeg_aspect.ts
with e.g. -vo x11 and -vo gl (-vo xv was not affected).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20607 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 16:20:25 +00:00
henry 1c714fb0ca qp height should be in macroblocks, not pixels
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20601 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 19:52:42 +00:00
reimar ad95e7a79a Do not modify parsed command-line values on config,
use a local variable instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20577 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 10:52:23 +00:00
eugeni efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
ods15 6355be18bd make vf_geq read whitespace in equation param
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20482 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:50:22 +00:00
ods15 bc9d65db85 remove unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20473 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 21:34:05 +00:00
ods15 6c1309fe19 cosmetic, reindentation, tab removal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20472 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 21:33:01 +00:00
ods15 591f6c68bb update vf_geq to new ff_eval API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-27 19:40:48 +00:00
eugeni e8733cbf9d Split ass_configure() into several smaller functions.
FontConfig initialization moved from ass_init() to ass_set_fonts().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-26 20:08:46 +00:00
reimar 88c688595e Add proper flv fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20435 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-24 18:45:17 +00:00
lorenm f8e6b3f0b8 x264: don't enable turbo in the middle pass of a 3pass encode. (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20346 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 21:57:15 +00:00
reimar a21dc05006 Add a call to x264enc_set_param in config, otherwise mencoder -ovc x264
would crash when no x264encopts specified.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20339 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 19:34:06 +00:00
reimar e9e5d67d19 Do not use sh_audio->wf values if they are definitely invalid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20334 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 17:01:45 +00:00
lorenm 11a8049263 make any parse error in -x264encopts fatal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:19:29 +00:00
lorenm 9f8a17df72 make -passlogfile work with x264 again (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20303 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-19 08:15:47 +00:00
michael 84aad40d58 bilinear interpolation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20276 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 20:21:31 +00:00
michael c6fcd1fe5d 200 byte is too little
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20274 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 18:37:40 +00:00
michael bc040ace6f generic equation filter
example: -vf 'geq=(p(X\,Y)+p(mod(Y*2-X*2\,W)\,mod(Y*2+X*2+sin((X-Y)/10/SW+N)*SW*20\,H)))/2'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20272 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 15:47:32 +00:00
gpoirier 087b6f4c1b Use American spelling of "gray" instead for British's "grey" for XviD option, while keeping backward compatibility
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20265 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 11:57:11 +00:00
lorenm 34a5cd1be8 fix multiple instances of -x264encopts on the commandline (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 23:11:36 +00:00
eugeni cb3292b17d Fix typo in sub_delay external specification.
Patch by Jindrich Makovicka <makovick a gmail d com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20203 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-13 20:28:07 +00:00
rtogni 25b5b62319 Allows up to 8 bytes of extradata for cmsg24
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20150 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 22:15:01 +00:00
nicodvb 1d4b4b1d71 reinit codec chain when aspect ratio and/or resolution change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20121 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 22:36:24 +00:00
ivo eac9434e00 print bits/s, not bytes/s
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-06 21:56:15 +00:00
nicodvb 31856891fc workaround redefinition of object_type as prev(object_type)+1
in recent faac cvs (without version number increase)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20086 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 23:12:27 +00:00
lorenm 0594cd07a0 Remove the x264 option parser, and pass the options on to libx264 as a string instead. This provides automatic support for all current and future x264 options.
A few options had to be reorganized: partitions, deblockalpha/beta, me, direct_pred.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20060 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 02:03:10 +00:00
corey 30ad3c812e make PSNR printing more consistent with other encoders
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20023 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-03 23:20:31 +00:00
eugeni 4f3df622bf Simplify and optimize bitmap blending.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20018 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-02 17:30:18 +00:00
gpoirier 864a6c9f20 Compile fix for odd versions of binutils, namely the ones in Fedora.
Patch by Reimar
Original thread:
Date: Oct 1, 2006 4:42 PM
Subject: Re: [MPlayer-dev-eng] vf_yadif.c: fix for (probably) older binutils


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20016 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 19:51:04 +00:00
eugeni 50ca7a4f72 Add copyright notice and vim/emacs comments to libass and vf_ass.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 17:09:04 +00:00
nicodvb 8ada2d6b87 in case of errors after decoding quit the main decoding
loop before memmove() when sh_audio->in_buffer_len <= 0;
patch by Chandan Pitta chandan.pitta gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20001 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-27 21:45:15 +00:00
rik 830063b190 Cosmetics and comments.
Patch by Karolina Lindqvist <karolina.lindqvist@kramnet.se>
"This is the whitespace patch for vf_zrmjpeg.c with doxygen comments that I
promised a while ago."

Some additional whitespace fixes by me, there are no functional changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 16:28:57 +00:00
rik 4bb03ad126 Patch by Karolina Lindqvist <karolina.lindqvist@kramnet.se>
"This patch is the MMX optimizations for the zrmjpeg filter, which is used by
the zr2 video output driver."

With some small changes by me:
- column width=80
- kept jpeg_enc_* functions static because they confuse the current vo_zr.c
- did not include jpeg_enc.h because jpeg_enc functions are still static


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 15:31:21 +00:00
diego 69f718e99a verbosity--;
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 10:42:03 +00:00
reimar 067c55bb46 Add forgotten emms which caused weird bugs like nan pts values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19948 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 09:18:20 +00:00
reimar 9c4bdf068e Fix compilation if HAVE_MMX is defined but NAMED_ASM_ARGS isn't
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19929 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-22 09:33:30 +00:00
diego 33832856df Replace preprocessor hacks to work around compilers not supporting named
assembler arguments with a proper configure check.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 16:48:50 +00:00
lucabe 1f88518638 Use PIX_FMT_* instead of IMGFMT_* when calling sws_getContext()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19876 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 15:02:13 +00:00
ods15 62967911f0 conditional declerations are unnecessary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19869 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 10:24:26 +00:00
eugeni 21faec3791 Add repeated screenshot mode to vf_screenshot.
It is triggered by "screenshot 1".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19839 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 13:27:59 +00:00
lorenm 44a1a8ecb7 mmx implementation of yadif. 3.5x faster.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19836 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-14 04:00:49 +00:00
lorenm 4b28d2e4d4 cosmetics (indentation)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19835 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-14 03:59:48 +00:00
lorenm b30e300dca cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19834 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-14 03:59:28 +00:00
diego e8dc2242b9 Add noglobal counterpart to the global flag.
patch by Jeff Clagg, snacky {at} ikaruga {dot} co {dot} uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19629 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 20:38:45 +00:00
rik 3d5fedd66a Patch from Karolina Lindqvist <karolina.lindqvist@kramnet.se>
"There is a bug in the zoran -vo zr driver, that makes the output garbled
always. It also probably affects the zrmjpeg filter.  This patch takes care of
the problem."

Patch tested and OK. And 10l to me, because this bug probably has existed for a
looong time.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 18:49:40 +00:00
diego 66b1d0d001 The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 12:11:11 +00:00
aurel b127df8645 fix build failure when ASS is disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19588 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 23:32:24 +00:00
michael 7f3113fab8 "global header" support, this is pretty much just copy and pasted code from
libavcodec/x264.c and libmpcodecs/ve_lavc.c, with it -ovc x264 can be used 
together with lavf to make working .psp files amongth other things
feel free to reverse, flame, ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19583 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 19:32:53 +00:00
eugeni cc6a66766d Add EOSD support to vf_vo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19582 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 19:10:11 +00:00
michael 86a3d94253 segfault fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19575 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 18:09:58 +00:00
eugeni 432868f92c Add -(no)ass-use-margins option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 15:12:45 +00:00
eugeni a7146f5551 Zero fill ass_settings_t before use.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19556 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 10:57:29 +00:00
eugeni 2ddfdc85b3 Add VFCTRL_DRAW_EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19527 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 22:10:43 +00:00
reimar fa94660a60 A value of 2 is valid for noup, too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19526 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 17:21:03 +00:00
eugeni 43a971a720 Simplify vf_ass initialization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 15:36:20 +00:00
reimar c8007742e7 Get rid of useless vf->priv casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19469 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-20 22:48:36 +00:00
diego b02e7924b9 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
ivo 0242e630f9 display correct audio bitrate, samplerate and number of channels once
they are known for mplayer -identify



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19409 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 20:06:31 +00:00
ivo f503cce428 display corrected aspect ratio for mplayer -identify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19408 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 19:51:57 +00:00
gpoirier 6c1bca9b66 Set encoder's input format to "native endiannes", instead of little endian.
Original thread:
Date: Aug 9, 2006 11:55 PM
Subject: Re: [PATCH] bugfix: lame endianess for Solaris/SPARC

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 14:32:50 +00:00