1888e57af7
cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
...
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.
Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
9a34ae4fd0
Merge svn changes up to r31050
2010-04-26 18:46:18 +03:00
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
c462186142
Tell x264 that we aren't going to give it timestamps.
...
Fixes some warnings starting in x264-r1480.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 09:14:54 +00:00
ff93cd656b
Add a header for x264enc_set_param() instead of forward declaring it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
bc1d0ca37d
Merge svn changes up to r30798
2010-03-10 02:35:02 +02:00
e86ecdac03
Reuse the keyframe flag from x264 instead of trying to derive it on our own.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:52:34 +00:00
4d08f30d25
Use the KEYFRAME define instead of some magic number.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:45:23 +00:00
e0bc115b4d
cosmetics: Rename struct vf_instance_s --> vf_instance.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 15:48:03 +00:00
e155d3d9f9
sync to x264-r1296
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 21:23:08 +00:00
4a35807e72
build: Support x264 version 78
2009-10-19 23:54:36 +03:00
7fd3eb0f74
Merge svn changes up to r29752
...
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.
2009-10-06 04:48:00 +03:00
de85aebe1e
Use x264_encoder_delayed_frames instead of the current hack to flush delayed
...
frames in VFCTRL_FLUSH_FRAMES.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 12:26:44 +00:00
1893615656
sync to x264-r1260 (which changed api)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-23 12:01:04 +00:00
95da34aa07
Merge svn changes up to r29532
2009-08-18 02:29:37 +03:00
a04ec2484b
Add a giant hack to the x264 encoder module to ensure all delayed frames are
...
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
2009-08-07 09:07:02 +00:00
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
d5c868325c
Merge svn changes up to r26979
...
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
2008-06-04 08:10:48 +03:00
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
267a3f4c9c
Merge svn changes up to r26680
...
Conflicts:
Makefile
configure
osdep/timer-darwin.c
2008-05-07 13:15:37 +03:00
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
0e757bf9da
Remove _s/_st suffix from some struct names
...
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Uoti Urpala
lorenm
diego
reimar
Uoti Urpala
nicodvb
michael
reynaldo
corey