virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
27,736 Commits 37 Branches 400 Tags 467 MiB
476aaec637
Commit Graph

39 Commits

Author SHA1 Message Date
Jason Garrett-Glaser
2c855cea85 Fix broken vbv_buffer_init handling in libx264.c 
Due to being pants-on-head retarded, libavcodec defaults this to zero, which
results in broken output.  This didn't affect ffmpeg.c, which sets it itself,
but caused problems for other calling apps using VBV.
(cherry picked from commit f7f8120fb9)
 2011-02-09 03:33:55 +01:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Marco Gittler
5f58927baf Pass field order flag to libx264 
Signed-off-by: Jason Garrett-Glaser <jason@x264.com>
(cherry picked from commit b09f548285)
 2011-01-28 03:15:32 +01:00
Jason Garrett-Glaser
3cf8db9447 Add fullrange support to libx264.c x264 interface 
Originally committed as revision 25904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 09:51:27 +00:00
Jason Garrett-Glaser
2c5168afed Remove bitrate tolerance from libx264 interface 
Nobody ever uses it correctly, and ffmpeg sets it incorrectly, so we'll just
leave it out.

Originally committed as revision 25720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-11 14:34:27 +00:00
Nicolas George
3ab354d777 Make libx264 take the pict_type input parameter into account, 
thus making forced key frames work.

Patch by Nicolas George, nicolas d george a normalesup d org

Originally committed as revision 25567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-25 14:40:00 +00:00
James Zern
2aa72ecccc Add new -slices option and use it for libvpx and libx264. 
Patch by James Zern, jzern google

Originally committed as revision 25551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-22 18:09:14 +00:00
Jason Garrett-Glaser
652d9d24dc Properly initialize x264_picture_t in libx264. 
Bump libx264 version requirement accordingly.

Originally committed as revision 23430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-02 20:05:27 +00:00
Baptiste Coudurier
d545fa56f1 fix x264 encoding when delay is > number of input frames 
Originally committed as revision 23197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-19 20:48:29 +00:00
Jason Garrett-Glaser
e8c7fca90c Add intra refresh and crf-max support to the libavcodec libx264 wrapper. 
Minor version bump.

Originally committed as revision 23038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-06 22:38:18 +00:00
Jason Garrett-Glaser
dbb4f0515f vertical align in libx264.c 
Originally committed as revision 22915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-19 21:20:20 +00:00
Takashi Mochizuki
d749da7e8b Fix typo: CODEC_FLAG2_SSIM is in flags2, not in flags. 
Patch by Takashi Mochizuki mochi (A) da2 (.) so (dash) net (dot) ne (.) jp

Originally committed as revision 22759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 15:52:50 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Baptiste Coudurier
f3b3b4895a Enable more libx264 options, aq, psy, rc lookahead and ssim 
Originally committed as revision 22670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 19:25:21 +00:00
Jason Garrett-Glaser
76d81909ae Update libx264.c to use new libx264 features 
With b_keyframe instead of IDR for detecting keyframes, ffmpeg should now
support periodic encoding with periodic intra refresh (although there is no
interface option for it yet).
Set the new timebase values for full VFR input support.
Bump configure to check for API version 83.

Originally committed as revision 21317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-19 04:00:08 +00:00
Loren Merritt
f543f636a5 revert r20775, because equivalent code has been committed to x264 instead 
Originally committed as revision 20783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-09 00:38:22 +00:00
Jason Garrett-Glaser
2d0cacded7 Boolify options passed to x264. 
Originally committed as revision 20775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 20:35:01 +00:00
Erik Slagter
25a42948c6 Add MBtree support for libx264 
Patch by Erik Slagter

Originally committed as revision 20774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 20:01:46 +00:00
Jason Garrett-Glaser
096c87f667 Add weightp support in API for libx264. 
ffmpeg can encode baseline profile again.

Originally committed as revision 20600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-24 15:49:34 +00:00
Jason Garrett-Glaser
1953898162 Update libx264.c for x264 API change 
Change behavior of b-pyramid option.

Originally committed as revision 20308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 09:35:19 +00:00
Diego Biurrun
8a8720c1bb cosmetics: K&R coding style, prettyprinting 
Originally committed as revision 20083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 18:03:30 +00:00
Jason Garrett-Glaser
2d3beedee2 Add support for new x264 API. 
Originally committed as revision 19977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 09:03:26 +00:00
Reimar Döffinger
2ba8301769 Mark all pix_fmts and supported_framerates compound literals as const. 
Makes no difference for gcc but at least icc can put them in .rodata then.

Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 16:09:21 +00:00
Jason Garrett-Glaser
fe022ce2f8 Fix libx264.c to not drop SEI userdata from x264 encoder. 
Most muxers in ffmpeg ignore the SEI if it is placed in extradata, so instead
it has to be catted to the front of the first video frame.

Originally committed as revision 19310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 23:45:01 +00:00
Ralf Terdic
5c4e97282f Fix mem leak. 
Patch by Ralf Terdic contact >AT< jswiff com

Originally committed as revision 15612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-13 13:47:05 +00:00
Jason Garrett-Glaser
a5d2413345 x264 has removed the b-rdo and bime options, and instead integrated 
them into the subme number to attempt to reduce the number of
unnecessary options.  subme now scales up to 9.
Patch by Jason Garett-Glaser %darkshikari A gmail P com%

Originally committed as revision 15523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 19:05:35 +00:00
Baptiste Coudurier
0bc4c436aa sync to latest x264 git, field was renamed 
Originally committed as revision 15337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-16 01:13:55 +00:00
Stefano Sabatini
d4be08e0c9 Make X264_init() no longer assign avctx->rc_eq to libx264's context. 
Fix a crash due to X264_init() setting the libx264 rc_eq field to NULL
when rc_eq was not defined. As a consequence rc_eq can no longer be
manually specified and passed to libx264, but this option is going to
be removed from the libx264 public API anyway.

See the thread: "Fix crash in libx264 when rc_eq is not set".

Originally committed as revision 15029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-29 17:37:32 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Baptiste Coudurier
89223ef698 add esa/dia compat me options and new tesa for libx264 
Originally committed as revision 13660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-05 01:57:35 +00:00
Baptiste Coudurier
d9e5c9b718 x264 interlaced encoding option 
Originally committed as revision 13656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-04 00:56:36 +00:00
Baptiste Coudurier
682a48a107 cleanup, remove useless parentheses 
Originally committed as revision 13655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-04 00:44:43 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 22:28:43 +00:00
Stefano Sabatini
6140271f54 Add some long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 07:24:44 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Benoit Fouet
3709f0d706 map warning levels between libx264 and libavutil 
Originally committed as revision 9607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-12 08:22:28 +00:00
Måns Rullgård
f225016296 update my email address 
Originally committed as revision 9489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 20:08:51 +00:00
Diego Biurrun
1cc60c47c5 Consistent naming and lib prefixes for x264, xvid and mp3lame within the code. 
Originally committed as revision 9230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 08:51:41 +00:00
Diego Biurrun
6f1af73557 Give all wrappers for external libraries names starting with lib. 
Originally committed as revision 9226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 00:14:18 +00:00