generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,226 Commits 24 Branches 241 Tags 173 MiB
3d2267019c
Commit Graph

103 Commits

Author SHA1 Message Date
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
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-04 00:45:21 +02:00
Mans Rullgard
b27565b143 Remove statements immediately following unconditional jumps 
This removes a number of compiler warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 03:15:53 +01: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
efd6cbc5dd flicvideo: fix crash on flic files with invalid frame size 
Add a check in flic_decode_frame_8BPP(), in case chunk_size is >
frame_size issue a warning and resize chunk_size to frame_size, in
order to avoid out-of-buffer reads.

Fix roundup issue #2520, trac issue #69.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-23 12:13:20 +02:00
Stefano Sabatini
cd1872799d flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR() 
Also return AVERROR_INVALIDDATA rather than -1.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-23 12:13:11 +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
6e73cef6e3 Fix several security issues in flicvideo.c 
This fixes CVE-2010-3429

Originally committed as revision 25223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 15:16:16 +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
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-26 12:20:04 +00:00
Måns Rullgård
3aab27b459 Remove useless #include <unistd.h> from many files 
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 23:37:53 +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
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
Diego Biurrun
65ffe3e85c Fix filenames in doxygen comments. 
Originally committed as revision 16911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 01:29:30 +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
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +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
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Michael Niedermayer
c27fc644d4 const 
Originally committed as revision 11727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 04:17:56 +00:00
Mike Melanson
f55f27ba98 Fix issue 123 (Support Magic-carpet fli version, 
https://roundup.mplayerhq.hu/roundup/ffmpeg/issue123 ) by rearranging the bit depth

Originally committed as revision 10290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-04 17:31:25 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Måns Rullgård
e1659f0cc7 fix indentation 
Originally committed as revision 9336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 14:52:12 +00:00
Måns Rullgård
dfdf9e78f3 replace endian detection hack with #ifdef WORDS_BIGENDIAN 
Originally committed as revision 9335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 14:52:10 +00:00
Diego Biurrun
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Diego Biurrun
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it. 
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 09:00:44 +00:00
Nicholas Tung
e4141433ea Get rid of unnecessary pointer casts. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 20:24:16 +00:00
Nicholas Tung
587d07227e Remove superfluous setting of has_b_frames in codecs without B-frames. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 17:37:30 +00:00
Alex Beregszaszi
cbc09a7d5a typo: unkown->unknown 
Originally committed as revision 8274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 00:27:23 +00:00
Alex Beregszaszi
492d0e4c12 display line number when printing error 
Originally committed as revision 8015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-18 01:02:34 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Luca Barbato
c61e1098e7 typo 
Originally committed as revision 7166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-24 12:36:06 +00:00
Steven Johnson
fce2200da0 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson 
Originally committed as revision 7165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-24 00:16:32 +00:00
Alex Beregszaszi
37e6f5f321 support byte_run=0 case in DELTA_FLI (this case means only skip pixels) 
Originally committed as revision 7164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-23 23:50:08 +00:00
Alex Beregszaszi
fe99025b16 10l memory corruption bug found by Steven Johnson 
Originally committed as revision 7163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-23 22:57:20 +00:00
Alex Beregszaszi
d8b45f7961 Fix possible overflows. Found by Steven Johnson 
Originally committed as revision 7065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 19:19:13 +00:00
Alex Beregszaszi
1e4051aaa0 correct signaling of palette change 
Originally committed as revision 6739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-19 23:03:47 +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
Dieter
1b47fafd9f make some functions static (patch by Dieter < freebsd at sopwith.solgatos.com >) 
Originally committed as revision 4905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-28 16:05:06 +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
Mike Melanson
515ae4760a support for FLX and DTA extensions in the FLIC format, courtesy of 
Steven Johnson (mplayer -at- sakuraindustries.com)

Originally committed as revision 4639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-13 04:35:31 +00:00
Mike Melanson
3c8c94b403 tinfoil patch: make sure that pixel pointer does not go out of bounds 
Originally committed as revision 4511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-13 16:59:01 +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
Mike Melanson
3a278992bd remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG -> 
MKTAG/MKBETAG

Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 04:04:08 +00:00
Roberto Togni
e40f5d3c6f Use reget buffer instead of copying from prev frame 
Added buffer hints, replaced printf with av_log

Originally committed as revision 2723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-25 16:43:09 +00:00
Mike Melanson
42cad81aea yep, FLI support 
Originally committed as revision 2519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-14 05:42:14 +00:00