virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
55,919 Commits 37 Branches 400 Tags 460 MiB
5c504e4df7
Commit Graph

177 Commits

Author SHA1 Message Date
Laurent Aimar
4a8ff0636d Prevent NULL dereference when the huffman table is invalid in the 4xm decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-02 03:24:16 +02:00
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Stefano Sabatini
01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Stefano Sabatini
10aa5a6c42 4xm: use reget_buffer() in decode_frame() 
Also remove unnecessary call to avctx->release_buffer(). reget_buffer
is required since apparently the codec needs to be feeded with the
previous frame data.

Releasing the frame and using get_buffer was working only in the case
get_buffer() was returning the old frame data, and resulting in
playback artifacts otherwise.

Fix trac issue #85.
 2011-04-27 11:50:38 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00: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
Diego Elio Pettenò
d36beb3f69 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>
 2011-01-26 16:08:45 +00:00
Michael Niedermayer
013291501f Allocate last picture for 4xm pfrm if its not allocated. 
Fixes segfault and issue2527

Originally committed as revision 26397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 22:08:34 +00:00
Vitor Sessak
c4e8733ac1 Fix visual artifacts in 4XM decoding on big-endian system 
Originally committed as revision 25734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 19:55:26 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:12:30 +00:00
Måns Rullgård
e6b22522c9 bswap: change ME to NE in macro names 
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.

Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:09:01 +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
Måns Rullgård
84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros 
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:24:59 +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
Carl Eugen Hoyos
59043195d4 Fix red/blue swap for 4xa files. 
Originally committed as revision 21070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 22:33:26 +00:00
Reimar Döffinger
4b5fee0205 Add missing release_buffer on close 
Originally committed as revision 20227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 18:28:37 +00:00
Måns Rullgård
b97e0d7fa2 4xm: provide 16-byte alignment where required 
Originally committed as revision 19717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 15:22:15 +00:00
Baptiste Coudurier
53e67085b2 4xm decoder uses get_buffer, set CODEC_CAP_DR1 
Originally committed as revision 19091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-05 08:12:14 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Reimar Döffinger
238ef6dadd Add a av_fast_malloc function and replace several uses of av_fast_realloc, 
thus avoiding potential memleaks and pointless memcpys.

Originally committed as revision 18470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 13:17:37 +00:00
Reimar Döffinger
9bf993a5b5 Use void * instead of uint8_t * for the destination buffer for dsp.bswap_buf 
where easily possible (mimic, eatqi, 4xm).
This allows to avoid a typecast.

Originally committed as revision 18469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 12:25:53 +00:00
Michael Niedermayer
2a0241ae12 Get rid of INIT_VLC_USE_STATIC in 4xm. 
Originally committed as revision 18435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 13:43:09 +00:00
Carl Eugen Hoyos
e161e007be Use INIT_VLC_USE_STATIC and not its value "1". 
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 11:47:15 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions. 
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 13:48:55 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead 
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 12:21:01 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +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
Stefano Sabatini
038f846e41 Add long names to some AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-28 10:21:58 +00:00
Diego Biurrun
04932b0d97 cosmetics: typo fixes 
Originally committed as revision 12554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:46:36 +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
Aurelien Jacobs
fbd4293df9 remove more useless mpegvideo.h includes 
Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 00:43:11 +00:00
Michael Niedermayer
ec9f649371 Replace get32() by AV_RL32(). 
Originally committed as revision 11755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:57:49 +00:00
Michael Niedermayer
530902f3c7 const 
Originally committed as revision 11754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:55:18 +00:00
Baptiste Coudurier
7f4d2d8308 cast to dest type, fix warning: 4xm.c:304: warning: initialization from incompatible pointer type 
Originally committed as revision 11676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-31 00:01:16 +00:00
Michael Niedermayer
c08bbe6c57 fix decoding of dracula.4xm before diego complains 
Originally committed as revision 10393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 01:21:32 +00:00
Michael Niedermayer
f9f835ee89 fix segfault with dracula.4xm 
closes issue132

Originally committed as revision 10392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 01:14:17 +00:00
Roberto Togni
b6f508bbcc Change 4xm demuxer and video decoder to pass the video format version in 
extradata instead of codec_tag.

Originally committed as revision 10253 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-27 21:58:39 +00:00
Michael Niedermayer
07c02992b9 use bytestream_get_le*() this also fixes a big endian bug 
Originally committed as revision 10104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 13:20:16 +00:00
Michael Niedermayer
40802d36bc fix type 3 aka skipped blocks for old version 
Originally committed as revision 10097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 01:06:04 +00:00
Michael Niedermayer
9ac34d947a fix motion vectors for old version 
Originally committed as revision 10096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 01:05:19 +00:00
Michael Niedermayer
cf786021a6 set pix_fmt properly depending on version 
Originally committed as revision 10095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 00:56:26 +00:00
Michael Niedermayer
70bbeb6fbf use version instead of some random 32bit value to switch between 16 and 
32bit versions (this is more reliable, the old code failed on some files)

Originally committed as revision 10094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 00:55:39 +00:00
Michael Niedermayer
a0d30cbcbf replace vlc_type by version and set that from codec_tag which contains the 
4xm video version from the demuxer

Originally committed as revision 10093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 00:53:55 +00:00
Michael Niedermayer
b74fb935f8 support ifr2 from Toy-Story2_better-image-quality.4xa 
Originally committed as revision 10091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-12 15:47:27 +00:00
Michael Niedermayer
62f68aa9bf add second vlc table 
pfr* of Toy-Story2_better-image-quality.4xa are decoded now without
bitstream errors

Originally committed as revision 10089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-12 12:22:19 +00:00
Carl Eugen Hoyos
154e30f6c2 rename attribute_unused to av_unused and moves its declaration to common.h 
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM

Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 09:32:25 +00:00
Reimar Döffinger
e36d79c837 Change some leftover __attribute__((unused)) and __attribute__((used)) to 
attribute_unused and attribute_used respectively to ease compiling on non-gcc.

Originally committed as revision 9024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-14 14:07:50 +00:00
Michel Bardiaux
78104b5d76 Remove some old disabled debugging output 
Originally committed as revision 8027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-19 11:00:38 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings 
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:47:39 +00:00
Michael Niedermayer
3a1a7e32ac sanity checks, some might have been exploitable ... 
Originally committed as revision 5369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-13 10:45:26 +00:00
Steve L'Homme
68b51e58ce MSVC-compatible __align8/__align16 declaration 
patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr

Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-05 13:35:17 +00:00
Diego Biurrun
f038fe8b4a warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it 
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-25 22:10:13 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") 
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 17:21:11 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder 
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 18:09:06 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks 
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:16:25 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>) 
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-27 18:10:06 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup 
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 14:37:16 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix 
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 17:42:58 +00:00
Alex Beregszaszi
6ce1a818e1 unknown format chars 
Originally committed as revision 2974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-07 13:14:29 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 13:26:22 +00:00
Michael Niedermayer
c9319f2ea4 forgot to commit, i hope its correct 
Originally committed as revision 2357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-11 09:11:15 +00:00
Falk Hüffner
e4e70d2e2d Fix compilation with ccc 
Originally committed as revision 2298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-22 20:29:58 +00:00
Fabrice Bellard
83586795a2 remove warnings 
Originally committed as revision 2245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-09 22:48:19 +00:00
Michael Niedermayer
b60ad448de fix 4xm yuv->rgb565 transform 
Originally committed as revision 1925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-01 10:56:36 +00:00
Michael Niedermayer
5be8a3737b 10l (array[-1] ...) 
Originally committed as revision 1924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-01 10:13:29 +00:00
Michael Niedermayer
8809cfee0a 4xm codec 
Originally committed as revision 1923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-01 00:56:05 +00:00