Commit Graph

72 Commits

Author SHA1 Message Date
diego c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:23:02 +00:00
diego e9de5ea8df Relicense file as GPL v2+; bero granted permission on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 07:49:35 +00:00
diego e27d606714 Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved
for the system, names starting with _ are reserved at file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 23:20:15 +00:00
lorenm ffc9727f99 remove code for colorspaces x264 doesn't support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25598 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 11:03:54 +00:00
reimar c3fc57f402 Add appropriate const specifiers to some custom parse functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25260 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:40:20 +00:00
diego 20d778b3fa Add explicit location for headers from the libmpdemux/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:51:32 +00:00
diego 6b14d50848 Add explicit location for headers from the stream/ directory.
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:30:55 +00:00
reimar 767fea6f4f Avoid crash when uninit is called without ever calling config in x264 encoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22176 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-08 15:42:53 +00:00
lorenm 3a49ee1618 fix a segfault if -x264encopts is the last commandline option (with no argument)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22050 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 20:22:21 +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 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
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
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
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
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
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
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
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
lorenm e08fe8174f sync to x264 r537 (api change)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-18 01:28:56 +00:00
reynaldo 58ed2c3fe0 marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-15 16:03:12 +00:00
lorenm 94b93ccc69 sync to x264 r503 (dct_decimate)
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18208 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 19:30:57 +00:00
michael 02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 21:26:42 +00:00
lorenm 5283b5beef sync to x264 r476 (subq=7)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-20 23:13:37 +00:00
lorenm 66419046a2 sync to x264 r457 (direct_pred=3)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17732 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-05 07:23:12 +00:00
corey 960b978a03 Fix video delay when encoding with B-frames.
Encoding delay is adjusted for on-the-fly during encoding.

Decoding delay is compensated for by setting an appropriate dwStart on
the audio stream (only in muxer_avi at this point).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-21 09:39:22 +00:00
diego 872a28cc57 Move conditional compilation out of the code and into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-31 23:36:12 +00:00
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
lorenm 7bf3599898 sync to x264 r398.
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-16 01:37:32 +00:00
lorenm 457b63508d sync to x264 r390 (bime)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17269 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-30 05:15:27 +00:00
lorenm fc2831619d 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17027 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 05:32:28 +00:00
lorenm c965918454 sync to x264 r373 (brdo)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17026 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 05:17:17 +00:00
diego 36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
lorenm 3c1298e0f7 sync to x264 r360 (trellis)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16899 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-04 01:01:19 +00:00
lorenm ff48164f90 sync to x264 r334 (crf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16847 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-24 04:39:18 +00:00
lorenm 9b1096e251 sync to x264 r318 (mixed_refs)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16713 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-08 22:28:27 +00:00
gpoirier b2e88f2b32 custom quantization matrix for x264, original patch by Robert Swain < robert POUM swain AH gmail POUM com>
Lots of nits and improvement by the MPlayer team
Original thread:
Date: Jul 12, 2005 5:04 PM
Subject: [MPlayer-dev-eng] [PATCH] CQMs in x264


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16367 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 21:54:17 +00:00
iive 28cdf537a0 add (no)visualize options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16017 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-19 17:56:51 +00:00
gpoirier f0e62b7c9c 1/2 l: last patch lacked the option name, so it wasn't activeable
^^^ wasn't breaking CVS ;-)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15967 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-11 19:02:39 +00:00
gpoirier c60555edbf x264 fast first pass, patch by Robert Swain < robert POUM swain AH gmail POUM com >
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15965 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-11 17:52:03 +00:00
lorenm 8348626c8f sync to x264 rev264 (lossless)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15745 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-17 08:26:12 +00:00
lorenm 4e27543174 sync to x264 rev263 (RDO)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15725 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-15 02:28:06 +00:00
lorenm 09dce31b8b sync to x264 r252 (8x8dct)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15655 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-05 19:05:00 +00:00
lorenm 2bdc7899a1 sync to x264 r240 (threads)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15591 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 19:05:32 +00:00
lorenm d6a8698f57 sync to x264 r239 (zoned ratecontrol and UMHex ME)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15558 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 06:03:37 +00:00
lorenm 18a4416a88 sync to x264 rev223 (options: ratetol, vbv_*)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15414 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-11 16:00:12 +00:00
lorenm 7bbd20a293 expose x264 options 'me' and 'me_range'.
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15353 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-05 17:10:16 +00:00
lorenm 18fe92cd19 remove x264 option "cabacidc", because the default is always best.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15150 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-13 19:10:29 +00:00
lorenm 20a3c8c24c sync to x264 171: chroma_me, chroma_qp_offset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14944 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-14 23:26:11 +00:00