summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ve_x264.c
Commit message (Collapse)AuthorAgeFilesLines
* cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-3/+3
| | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* Merge svn changes up to r31050Uoti Urpala2010-04-261-0/+1
|\
| * Tell x264 that we aren't going to give it timestamps.lorenm2010-04-201-0/+1
| | | | | | | | | | | | | | Fixes some warnings starting in x264-r1480. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-261-0/+1
|\|
| * Add a header for x264enc_set_param() instead of forward declaring it.diego2010-04-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30798Uoti Urpala2010-03-101-5/+2
|\|
| * Reuse the keyframe flag from x264 instead of trying to derive it on our own.reimar2010-02-281-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the KEYFRAME define instead of some magic number.reimar2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-211-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync to x264-r1296lorenm2009-10-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: Support x264 version 78Uoti Urpala2009-10-191-1/+1
| |
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-37/+10
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Use x264_encoder_delayed_frames instead of the current hack to flush delayedreimar2009-09-231-4/+2
| | | | | | | | | | | | | | frames in VFCTRL_FLUSH_FRAMES. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync to x264-r1260 (which changed api)lorenm2009-09-231-33/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-1/+3
|\|
| * Add a giant hack to the x264 encoder module to ensure all delayed frames arereimar2009-08-071-1/+3
| | | | | | | | | | | | | | | | written on FLUSH_FRAMES, this is necessary since using multiple threads adds an additional delay beyond the B-frame delay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29480 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-6/+6
| |
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove pointless parentheses from return calls.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Uoti Urpala2008-05-071-11/+11
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Relicense file as GPL v2+; bero granted permission on IRC.diego2008-05-071-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-8/+8
|/ | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* Fix illegal identifiers: Names starting with __ or _ and uppercase are reserveddiego2008-01-061-1/+1
| | | | | | | 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
* remove code for colorspaces x264 doesn't supportlorenm2008-01-051-26/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add appropriate const specifiers to some custom parse functions.reimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25260 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the libmpdemux/ directory.diego2007-03-151-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-2/+2
| | | | | | | Now for the encoding-related files as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash when uninit is called without ever calling config in x264 encoderreimar2007-02-081-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22176 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix a segfault if -x264encopts is the last commandline option (with no argument)lorenm2007-01-281-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22050 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-1/+1
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* x264: don't enable turbo in the middle pass of a 3pass encode. (broke in r20060)lorenm2006-10-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20346 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a call to x264enc_set_param in config, otherwise mencoder -ovc x264reimar2006-10-211-0/+2
| | | | | | | would crash when no x264encopts specified. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20339 b3059339-0415-0410-9bf9-f77b7e298cf2
* make any parse error in -x264encopts fatallorenm2006-10-201-3/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
* make -passlogfile work with x264 again (broke in r20060)lorenm2006-10-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20303 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix multiple instances of -x264encopts on the commandline (broke in r20060)lorenm2006-10-151-55/+67
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the x264 option parser, and pass the options on to libx264 as a ↵lorenm2006-10-051-310/+41
| | | | | | | | | 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
* Add noglobal counterpart to the global flag.diego2006-09-011-0/+1
| | | | | | | 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
* The FSF changed postal address.diego2006-09-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
* "global header" support, this is pretty much just copy and pasted code from michael2006-08-281-0/+36
| | | | | | | | | 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
* sync to x264 r537 (api change)lorenm2006-07-181-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19130 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several read-only string parameters which aren't modified inside the ↵reynaldo2006-07-151-1/+1
| | | | | | 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
* sync to x264 r503 (dct_decimate)lorenm2006-04-221-0/+4
| | | | | | | patch by Guillaume Poirier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18208 b3059339-0415-0410-9bf9-f77b7e298cf2
* passing pts through the filter layer (lets see if pts or cola comes out at ↵michael2006-03-211-2/+2
| | | | | | the end) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r476 (subq=7)lorenm2006-03-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r457 (direct_pred=3)lorenm2006-03-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17732 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix video delay when encoding with B-frames.corey2006-02-211-0/+7
| | | | | | | | | | 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
* Move conditional compilation out of the code and into the build system.diego2006-01-311-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
* change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to ↵michael2006-01-261-1/+1
| | | | | | muxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r398.lorenm2006-01-161-0/+7
| | | | | | | patch by Guillaume Poirier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17403 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r390 (bime)lorenm2005-12-301-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17269 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10llorenm2005-11-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17027 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r373 (brdo)lorenm2005-11-221-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17026 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r360 (trellis)lorenm2005-11-041-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16899 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r334 (crf)lorenm2005-10-241-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16847 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r318 (mixed_refs)lorenm2005-10-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16713 b3059339-0415-0410-9bf9-f77b7e298cf2
* custom quantization matrix for x264, original patch by Robert Swain < robert ↵gpoirier2005-09-021-0/+63
| | | | | | | | | | | | 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
* add (no)visualize optionsiive2005-07-191-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16017 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1/2 l: last patch lacked the option name, so it wasn't activeablegpoirier2005-07-111-0/+1
| | | | | | | ^^^ wasn't breaking CVS ;-) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15967 b3059339-0415-0410-9bf9-f77b7e298cf2
* x264 fast first pass, patch by Robert Swain < robert POUM swain AH gmail ↵gpoirier2005-07-111-20/+40
| | | | | | POUM com > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15965 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 rev264 (lossless)lorenm2005-06-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15745 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 rev263 (RDO)lorenm2005-06-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15725 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r252 (8x8dct)lorenm2005-06-051-7/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15655 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r240 (threads)lorenm2005-05-291-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15591 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r239 (zoned ratecontrol and UMHex ME)lorenm2005-05-241-4/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15558 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 rev223 (options: ratetol, vbv_*)lorenm2005-05-111-17/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15414 b3059339-0415-0410-9bf9-f77b7e298cf2
* expose x264 options 'me' and 'me_range'.lorenm2005-05-051-0/+10
| | | | | | | patch by Guillaume Poirier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15353 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove x264 option "cabacidc", because the default is always best.lorenm2005-04-131-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15150 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 171: chroma_me, chroma_qp_offsetlorenm2005-03-141-5/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14944 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r150: new option 'b_pyramid'lorenm2005-03-041-0/+4
| | |