RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,644 Commits 36 Branches 398 Tags 226 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
Michael Niedermayer 042f9d62ca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Automatically add more flags required on symbian
  mem.h: switch doxygen parameter order to match function prototype
  doxygen: replace @sa tag by the more readable but equivalent @see
  doxygen: use Doxygen markup for authors and web links where appropriate
  doxygen: do not include license boilerplate in Doxygen documentation
  ac3enc: Mark AVClasses const
  ffserver: Replace two loops with one loop.
  ffmpeg: Fix the check for experimental codecs
  swscale: extend mmx padding.
  swscale: clip unscaled colorspace conversion path.
  doxygen: misc consistency cosmetics
  doc: remove file name from @file directive in Doxygen usage example
  doxygen: consistently place brief description
  doxygen: place empty line between brief description and detailed description
  avformat_open_input(): Add braces to shut up gcc warning.

Conflicts:
	libavcodec/8svx.c
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/vaapi_h264.c
	libavcodec/vorbis.c
	libavcodec/vorbisdec.c
	libavcodec/vp6.c
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-15 17:51:09 +02:00
Diego Biurrun ad4cd0c2a4 doxygen: use Doxygen markup for authors and web links where appropriate 2011-07-15 02:01:21 +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 Biurrun 9a58234fea Fix misspelled parameter names in Doxygen documentation. 
This fixes one Doxygen warning each.

Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 10:49:29 +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
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 406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Reimar Döffinger b08edb2268 check that csize in ff_lzw_decode_init is < LZW_MAXBITS, <= is not enough and 
might read outside the prefix array

Originally committed as revision 14214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 20:03:57 +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
Michael Niedermayer 7993df6527 consts 
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:26:31 +00:00
Michael Niedermayer f39c3c8855 factorize & 
Originally committed as revision 8525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-26 00:54:29 +00:00
Michael Niedermayer 0abfd53344 simplify 
Originally committed as revision 8524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-26 00:44:42 +00:00
Michael Niedermayer 0cb7f8a260 check input validity, this prevents a few variables from reachin odd values which might have lead to out of array writes and thus might have been exploitable 
Originally committed as revision 8522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 23:37:38 +00:00
Michael Niedermayer 34a370cb0c simplify 
Originally committed as revision 8521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 23:22:11 +00:00
Michael Niedermayer 5f01beb548 move eob_reached logic into ff_lzw_decode_tail() which simplifies the code, avoids some checks in the innermost loop and also gets rid of the controversal break while hopefully retaining the last byte in a valid bytestream, invalid bytestreams still can have very significant overread 
Originally committed as revision 8517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 15:43:46 +00:00
Michael Niedermayer 6aaf3abd6d simplify 
Originally committed as revision 8514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 15:09:16 +00:00
Michael Niedermayer bf7709619b factorize 
Originally committed as revision 8510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 14:02:54 +00:00
Michael Niedermayer 62ef8925c5 simplify 
Originally committed as revision 8509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-25 13:41:14 +00:00
Baptiste Coudurier 93e91145b4 fix indentation 
Originally committed as revision 8499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-24 23:23:51 +00:00
Baptiste Coudurier 36376fa3ba break if eob is reached to avoid reading one too much byte 
Originally committed as revision 8498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-24 23:23:05 +00:00
Kostya Shishkov ffc5430bc3 LZW decoder as separate module plus TIFF LZW support 
Originally committed as revision 6795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-26 04:15:48 +00:00