virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
29,011 Commits 37 Branches 400 Tags 465 MiB
aa0c515a3c
Commit Graph

95 Commits

Author SHA1 Message Date
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01:00
Christophe Massiot
b6d0700058 Pass VBV delay to the calling application via ctx 
VBV delay is useful for T-STD compliance in some TS muxers. It is
certainly possible to retrieve it by parsing the output of FFmpeg, but
getting it from the context makes it simpler and less error-prone.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-16 02:07:51 +01:00
Ronald S. Bultje
d23e3e5fea Move ff_emulated_edge_mc() into DSPContext. 
(cherry picked from commit 2e27959879)
 2011-01-30 03:41:01 +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
Mans Rullgard
e164311179 Make denoise_dct_c() and dct_quantize_trellis_c() static in definitions 
1d4da6a460 added static to the
prototypes for these fuctions.  Adding it to the definitions
as well.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa61e39eac)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
295edc7794 Make denoise_dct_c and dct_quantize_trellis_c static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1d4da6a460)
 2011-01-26 03:43:29 +01:00
Stefano Sabatini
2d777bb7a2 Make mpeg4 encoder log a more explicit error message when the timebase 
is not valid.

Originally committed as revision 26223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 11:36:43 +00:00
Michael Niedermayer
db61329607 Our ljpeg encoder supports bgra, use the correct constant in the sanity check. 
Originally committed as revision 26220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:35 +00:00
Michael Niedermayer
dc8465a9b4 Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ... 
Originally committed as revision 26218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:21 +00:00
Michael Niedermayer
e27bf2c70c Fix YUV444P LJPEG encoding. 
Originally committed as revision 26215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 18:57:16 +00:00
Baptiste Coudurier
35e33b9aac 10l fix h263 encoder resolution test, array size is 8 not 7 
Originally committed as revision 25305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 01:26:00 +00:00
Michael Niedermayer
53eb458a72 Fix rv20 encoding so the binary decoder can decode it. 
Originally committed as revision 25203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 01:56:48 +00:00
James Darnley
8d39fbd6d9 Allow mpeg encoding with qscale and very low frame rate. 
Patch by James Darnley, james D darnley A gmail

Originally committed as revision 25102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 23:41:14 +00:00
Måns Rullgård
b33451eeac Check rc_buffer_size value using integer arithmetic 
Using floating-point here can cause erroneous rejection of
parameters due to rounding errors leading to a slightly too
large result.

This fixes the mxf regression test with gcc 4.5 on x86_32.

Originally committed as revision 25060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:54:48 +00:00
Rodney Baker
2d525ef483 Change all occurences of "inofficial" to "unofficial" in code, comments 
and options. Keep old options until next major version bump.

Patch by Rodney Baker, rodney d baker a iinet d net d au

Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 15:35:23 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +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
Pavel Pavlov
be548816dc Always check if ff_alloc_picture() succeeds. 
Patch by Pavel Pavlov, pavel summit-tech ca

Originally committed as revision 22648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 17:58:39 +00:00
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264. 
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 02:17:04 +00:00
Michael Niedermayer
53f66cee0c Add ff_ prefix for mpeg2_dc_scale_table. 
Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:49:46 +00:00
Michael Niedermayer
6506c3d2b2 Support intra_dc_precision>8 in jpeg 
Originally committed as revision 22554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 21:27:13 +00:00
Michael Niedermayer
bd57cae86f use mpeg2 quantization bias for mjpeg. 
this seems to improve RD performance.

Originally committed as revision 22550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 16:37:02 +00:00
Måns Rullgård
94ca624fbc Move ff_sqrt() to libavutil/intmath.h 
Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 21:19:56 +00:00
Måns Rullgård
40d1122752 Use LOCAL_ALIGNED macro for local arrays 
Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 20:36:20 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Alexander Strange
7ffd8332c7 Add missing internal.h to files calling ff_match_2uint16(). 
Fixes warnings:
libavcodec/mpegvideo_enc.c:574: warning: implicit declaration of function
'ff_match_2uint16'
libavcodec/ituh263enc.c:143: warning: implicit declaration of function
'ff_match_2uint16'
libavcodec/svq1enc.c:97: warning: implicit declaration of function
'ff_match_2uint16'

Originally committed as revision 21133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 04:57:04 +00:00
Michael Niedermayer
c46eeae2a8 Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1 
instead of custom and bloated code to find an index into a w/h array.

Originally committed as revision 21113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 18:33:21 +00:00
Michael Niedermayer
ca334dd14b Split the mpeg4 encoder and decoder off h263.c 
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 23:53:49 +00:00
Michael Niedermayer
6a14a15722 Move forgotton "AVCodec flv_encoder" over to flvenc.c. 
Originally committed as revision 21052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 05:41:49 +00:00
Michael Niedermayer
eb52376915 Split out flv encoding. 
Originally committed as revision 21050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 04:42:39 +00:00
Diego Biurrun
4052cbf161 Get rid of pointless CONFIG_ANY_H263 preprocessor definition. 
Originally committed as revision 20975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 11:33:59 +00:00
Diego Biurrun
f34121f351 Replace CONFIG_ANY_H263_ENCODER definition by CONFIG_H263_ENCODER. 
CONFIG_ANY_H263_ENCODER is just a logical OR of H.263 family definitions,
for which the build system enables CONFIG_H263_ENCODER anyway.

Originally committed as revision 20950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 17:36:03 +00:00
Michael Niedermayer
954a0b482a Check sample_aspect_ratio validity for mpeg4/h263/h263p encoding. 
Merged from ffmbc0.3

Originally committed as revision 20861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 11:34:46 +00:00
Michael Niedermayer
a1a63143f1 Cosmetic (restructure RGB ljpeg check to be more readable) 
Originally committed as revision 20793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 20:05:04 +00:00
Michael Niedermayer
401e0a74bd 10l, Fix YUV ljpeg that i just broke by mistake. 
Originally committed as revision 20792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 19:41:47 +00:00
Michael Niedermayer
e0b176adff Fix RGB LJPEG encoding. 
Originally committed as revision 20788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-10 18:07:35 +00:00
Michael Niedermayer
ccc4b91832 Make sure ff_init_qscale_tab() is called one way or another when 
adaptive quantization is enabled.
Fixes issue509.

Originally committed as revision 20726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 21:38:10 +00:00
Michael Niedermayer
9015b095bc Move ff_init_qscale_tab() from h263.c to mpegvideo, the function is not h263 specific. 
Originally committed as revision 20725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 21:36:58 +00:00
Stefano Sabatini
b0bef34209 Add additional long names for the Flash Video decoder and encoder. 
Originally committed as revision 20317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:45:44 +00:00
Reimar Döffinger
01418506a2 Remove casts that are useless since the argument is void *. 
Originally committed as revision 20177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 06:33:18 +00:00
Michael Niedermayer
b52b0913c2 Check for thread_count==0. 
fixed issue1333

Originally committed as revision 19809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 14:12:05 +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
Diego Biurrun
0bd485300e Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER. 
The latter can never be enabled without the former.

Originally committed as revision 19598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-05 15:27:22 +00:00
Diego Biurrun
965424dad1 Do not check for both CONFIG_H263_ENCODER and CONFIG_H263P_ENCODER. 
The latter can never be enabled without the former.

Originally committed as revision 19596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-05 15:22:16 +00:00
Diego Biurrun
735e36a3e4 Do not redundantly check for preprocessor definitions of CONFIG_RV10_ENCODER or 
CONFIG_RV20_ENCODER when also checking for CONFIG_H263_ENCODER.
The RV10/RV20 encoders depend on the H.263 encoder.

Originally committed as revision 19593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-05 10:46:43 +00:00
Diego Biurrun
f7e1353523 Move AVCodec declarations for RV10/20 from mpegvideo_enc.c to rv10.c. 
It is better to keep the declarations in conditionally compiled places.

Originally committed as revision 19573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-03 15:23:53 +00:00
Baptiste Coudurier
c0601d705c remove apparently unused real_pict_num from AVCodecContext 
Originally committed as revision 18969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 21:40:10 +00:00
Baptiste Coudurier
a4a750d3b2 Rename alloc_picture to ff_alloc_picture and move its definition 
in mpegvideo.h to avoid including mpegvideo_common.h in mpeg12.c,
because it contains motion code.

Originally committed as revision 18968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 19:55:35 +00:00
Baptiste Coudurier
01bc48f4d5 Set progressive_sequence before MPV_common_init which cares about it when 
setting mb_height for interlaced mpeg-2 encoding.

Originally committed as revision 18905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-23 01:22:43 +00:00
Michael Niedermayer
4601e76a43 Fix VBV delay for mpeg1/2 CBR. 
Originally committed as revision 18820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-14 03:37:58 +00:00