RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
37,925 Commits 37 Branches 400 Tags 268 MiB
Commit Graph

28 Commits

Author SHA1 Message Date
Michael Niedermayer 707138593a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-05 00:11:57 +01:00
Yordan Makariev 425b45d4b0 Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 15:13:48 -08:00
Michael Niedermayer 0a23067ab4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
  mpeg124: use sign_extend() function
  ac3dec: use get_sbits() instead of manually sign-extending
  4xm: fix signed overflow
  wmavoice: fix a signed overflow
  mpegvideo_enc: fix a signed overflow
  crc: fix signed overflow
  fate: run avconv with -nostats flag
  avtools: add -v as alias for -loglevel
  avconv: always print stats with AV_LOG_INFO
  doc/avconv: add forgotten output/per-stream info to -filter
  avconv: add -stats option to enable/disable printing encoding progress
  avconv: in output_packet() don't set decoded_data_size for video.
  avconv: remove pointless always true condition
  avconv: factorize common code in transcode_init()
  zmbv: remove memcpy() of decoded frame
  mpeg12enc: use sign_extend() function
  h264pred: use unsigned types for pixel values, fix signed overflows
  h264: fix signed overflows in x*0x01010101 expressions
  h264pred: remove unused variables

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-10 03:50:58 +02:00
Mans Rullgard 8b19ae0761 crc: fix signed overflow 
This fixes a signed overflow from i << 24 when i == 255 by
making i unsigned.  The result of the shift is already
assigned to an variable of unsigned type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-09 16:53:31 +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 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 e669590a0a Fix parameter name and position in av_crc_init Doxygen documentation. 
Originally committed as revision 23981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 11:49:17 +00:00
Måns Rullgård 49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Måns Rullgård 2ed6f39944 Replace many includes of libavutil/common.h with what is actually needed 
This reduces the number of false dependencies on header files and
speeds up compilation.

Originally committed as revision 22407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 17:39:19 +00:00
Jeff Downs d468ff0fdf Fix cast of byte buffer to uint32 that was disregarding alignment 
requirements.
Now calculates crc byte at a time until aligned, then continues with uint32
optimized calculation.
This fixes crashes during mlp decoding on sparc (at least, maybe others).

Originally committed as revision 19160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 02:13:12 +00:00
Diego Biurrun 7d685b486b spelling/grammar/consistency review part III 
Originally committed as revision 16849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 23:16:49 +00:00
Diego Biurrun 89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun e503674c4a Add necessary, remove unnecessary #includes. 
Originally committed as revision 16547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:03:42 +00:00
Aurelien Jacobs 37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Michael Niedermayer 070144671d Dont cast const away. 
Originally committed as revision 11700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 01:33:16 +00:00
Diego Biurrun f3635240b7 Fix a couple of 'return type defaults to int' and 'control reaches end of 
non-void function' warnings in test code.

Originally committed as revision 11491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-10 10:35:37 +00:00
Aurelien Jacobs 03d83abcc6 Fix access to the last element of the table. 
(size of the table vs. number of elements in the table)

Originally committed as revision 11448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 13:19:38 +00:00
Aurelien Jacobs 3abe5fbdc4 improve CRC API 
- don't export any global var
 - provide either generated or hardcoded tables

Originally committed as revision 11409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 23:09:58 +00:00
Diego Biurrun f8a80fd69d main() --> main(void) 
Originally committed as revision 11079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 00:52:56 +00:00
Reimar Döffinger 45e3c163a9 Additional documentation for CRC functions 
Originally committed as revision 10151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 16:54:47 +00:00
Reimar Döffinger 7b07d3e8fe Use defines instead of raw hex numbers to specify CRC polynomials 
Originally committed as revision 10143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-19 12:36:15 +00:00
Michael Niedermayer 08cb195020 kill 3 more av_mallocz_static() 
Originally committed as revision 8397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-14 01:59:53 +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
Diego Biurrun 04d7f60143 Add official LGPL license headers to the files that were missing them. 
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-10 14:02:42 +00:00
Michael Niedermayer a08d38ee82 put the code which is specific for the large crc table under #ifndef CONFIG_SMALL 
Originally committed as revision 5676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 20:23:19 +00:00
Michael Niedermayer 43a80ccee5 generic crc calculation code 
Originally committed as revision 5115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-06 14:13:01 +00:00