aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs/ve_x264.c
Commit message (Collapse)AuthorAge
* cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Gravatar Uoti Urpala2010-05-29
| | | | | | | 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 r31050Gravatar Uoti Urpala2010-04-26
|\
* \ Merge svn changes up to r31004Gravatar Uoti Urpala2010-04-26
|\ \
| | * Tell x264 that we aren't going to give it timestamps.Gravatar lorenm2010-04-20
| |/ | | | | | | | | | | | | Fixes some warnings starting in x264-r1480. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a header for x264enc_set_param() instead of forward declaring it.Gravatar diego2010-04-03
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30798Gravatar Uoti Urpala2010-03-10
|\|
| * Reuse the keyframe flag from x264 instead of trying to derive it on our own.Gravatar reimar2010-02-28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the KEYFRAME define instead of some magic number.Gravatar reimar2010-02-28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.Gravatar diego2010-02-21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync to x264-r1296Gravatar lorenm2009-10-19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: Support x264 version 78Gravatar Uoti Urpala2009-10-19
| |
* | Merge svn changes up to r29752Gravatar Uoti Urpala2009-10-06
|\| | | | | | | | | | | | | | | | | 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 delayedGravatar reimar2009-09-23
| | | | | | | | | | | | | | 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)Gravatar lorenm2009-09-23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Gravatar Uoti Urpala2009-08-18
|\|
| * Add a giant hack to the x264 encoder module to ensure all delayed frames areGravatar reimar2009-08-07
| | | | | | | | | | | | | | | | 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
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
| * whitespace cosmetics: Remove all trailing whitespace.Gravatar diego2009-05-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Gravatar Uoti Urpala2008-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2008-05-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Gravatar Uoti Urpala2008-05-07
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Relicense file as GPL v2+; bero granted permission on IRC.Gravatar diego2008-05-07
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesGravatar Uoti Urpala2008-04-25
|/ | | | | 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 reservedGravatar diego2008-01-06
| | | | | | | 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 supportGravatar lorenm2008-01-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add appropriate const specifiers to some custom parse functions.Gravatar reimar2007-12-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25260 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the libmpdemux/ directory.Gravatar diego2007-03-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.Gravatar diego2007-03-15
| | | | | | | 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 encoderGravatar reimar2007-02-08
| | | | 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)Gravatar lorenm2007-01-28
| | | | 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->fileGravatar nicodvb2006-12-18
| | | | 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.Gravatar reimar2006-12-09
| | | | | | | 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)Gravatar lorenm2006-10-21
| | | | 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 x264Gravatar reimar2006-10-21
| | | | | | | 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 fatalGravatar lorenm2006-10-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
* make -passlogfile work with x264 again (broke in r20060)Gravatar lorenm2006-10-19
| | | | 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)Gravatar lorenm2006-10-15
| | | | 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 ↵Gravatar lorenm2006-10-05
| | | | | | | | | 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.Gravatar diego2006-09-01
| | | | | | | 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.Gravatar diego2006-09-01
| | | | 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 Gravatar michael2006-08-28
| | | | | | | | | 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)Gravatar lorenm2006-07-18
| | | | 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 ↵Gravatar reynaldo2006-07-15
| | | | | | 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)Gravatar lorenm2006-04-22
| | | | | | | 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 ↵Gravatar michael2006-03-21
| | | | | | the end) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r476 (subq=7)Gravatar lorenm2006-03-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to x264 r457 (direct_pred=3)Gravatar lorenm2006-03-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17732 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix video delay when encoding with B-frames.Gravatar corey2006-02-21
| | | | | | | | | | 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.Gravatar diego2006-01-31
| | | | 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 ↵Gravatar michael2006-01-26
| | | | | | muxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2