generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
37,466 Commits 24 Branches 241 Tags
Commit Graph

26 Commits

Author SHA1 Message Date
Michael Niedermayer
568e9062bd Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 
* qatar/release/0.8: (154 commits)
  Update Changelog for the 0.8.1 Release
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  dca: don't use av_clip_uintp2().
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  h264: increase reference poc list from 16 to 32.
  h264: stricter reference limit enforcement.
  h264: improve parsing of broken AVC SPS
  Replace computations of remaining bits with calls to get_bits_left().
  png: convert to bytestream2 API.
  roqvideo: convert to bytestream2 API.
  smc: port to bytestream2 API.
  tgq: convert to bytestream2 API.
  algmm: convert to bytestream2 API.
  jvdec: unbreak video decoding
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  avconv: reindent
  ...

Conflicts:
	Changelog
	RELEASE
	avconv.c
	doc/APIchanges
	ffplay.c
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/alsdec.c
	libavcodec/atrac3.c
	libavcodec/avcodec.h
	libavcodec/dvdata.c
	libavcodec/fraps.c
	libavcodec/golomb.h
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264idct_template.c
	libavcodec/indeo3.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/mjpegbdec.c
	libavcodec/mmvideo.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.h
	libavcodec/options.c
	libavcodec/pngdec.c
	libavcodec/roqvideodec.c
	libavcodec/shorten.c
	libavcodec/svq3.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavcodec/xxan.c
	libavformat/Makefile
	libavformat/asfdec.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/nsvdec.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-16 09:01:08 +01:00
Ronald S. Bultje
12247a13e0 Don't use ff_cropTbl[] for IDCT. 
Results of IDCT can by far outreach the range of ff_cropTbl[], leading
to overreads and potentially crashes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit c23acbaed40101c677dfcfbbfe0d2c230a8e8f44)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2012-03-08 22:07:55 +01: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
Måns Rullgård
8fbd4f51a8 Improve some uses of ff_cropTbl with constant offset 
Originally committed as revision 23728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 23:12:48 +00:00
David Conrad
c0fda017d1 vp3: 10l Fix DC-only IDCT for C and ARM too 
Originally committed as revision 23359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-28 07:22:04 +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
David Conrad
eb6a6cd788 vp3: DC-only IDCT 
2-4% faster overall decode

Originally committed as revision 22896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-17 02:04:30 +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
David Conrad
9971331dfb Move VP3 loop filter to DSPContext 
Originally committed as revision 15551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 10:26:17 +00:00
Michael Niedermayer
f55a5281ac Fix decoding of 320x240.ogg. 
Originally committed as revision 14227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 23:34:29 +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
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h 
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-08 00:35:08 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl 
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 20:08:09 +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
Michael Niedermayer
d9cf32d920 avoid 4 + 
Originally committed as revision 5799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-19 23:51:11 +00:00
Michael Niedermayer
d26a9ea0df remove 166 useless underscores, and make this file valid c code as a result 
Originally committed as revision 5798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-19 23:21:20 +00:00
Michael Niedermayer
e003ea066b remove a few useless casts and avoid the useless t1/t2 variables 
Originally committed as revision 5797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-19 23:17:18 +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
79396ac685 Kill some compiler warnings. Compiled code verified identical after changes. 
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-06 21:25:35 +00:00
Måns Rullgård
bf4e3bd2d0 kill a bunch of compiler warnings 
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-14 15:42:40 +00:00
Michael Niedermayer
8b6103da0f porting vp3 idct over to lavc idct api 
Originally committed as revision 4257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-17 11:12:04 +00:00
Michael Niedermayer
ea191e08d6 remove permutation done to quant tables and then undone during idct 
move permutation from idct to unpack_vlcs

Originally committed as revision 4256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-17 09:18:49 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00
Mike Melanson
116824d0aa reorganize and simplify the VP3 IDCT stuff 
Originally committed as revision 3071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-26 00:20:29 +00:00
Mike Melanson
44cb64ee89 seperated out the C-based VP3 DSP functions into a different file; also 
ported the MMX-optimized versions of those functions

Originally committed as revision 2855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-08 02:13:45 +00:00