virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
36,381 Commits 37 Branches 400 Tags 458 MiB
7d8f115843
Commit Graph

18 Commits

Author SHA1 Message Date
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Diego Biurrun
e6ff064845 Eliminate pointless '#if 1' statements without matching '#else'. 2011-04-26 20:18:27 +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
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
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator). 
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 17:23:38 +00:00
Diego Biurrun
294eaa2643 Replace random() usage in test programs by av_lfg_*(). 
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 11:48:27 +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
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
Diego Biurrun
c47d146be8 Add missing 'void' keyword to parameterless function declarations. 
Originally committed as revision 16436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 13:57:43 +00:00
Diego Biurrun
ecad9872fb Initialize variable to silence the warning: 
libavutil/pca.c:72: warning: ‘k’ may be used uninitialized in this function

Originally committed as revision 15760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-31 06:52:37 +00:00
Michael Niedermayer
a8aefc8aed Copy and paste LGPL from tree.h, the previous one referred to a non-existing 
version.

Originally committed as revision 14818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 19:32:51 +00:00
Michael Niedermayer
ab1388e435 Move context struct to c file. 
Originally committed as revision 14809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:51:20 +00:00
Michael Niedermayer
6441737591 Make ff_pca_init() allocate it struct instead of letting the user provide 
one (more robust ABI wise).

Originally committed as revision 14807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:46:20 +00:00
Michael Niedermayer
7b0a6612c6 Do not mix declarations and statements (by ramiro). 
Originally committed as revision 14806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:35:55 +00:00
Michael Niedermayer
88ccaf6f31 put testing code under #ifdef TEST 
Originally committed as revision 14805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:33:17 +00:00
Michael Niedermayer
cd5cd37741 Testing code uses random(). 
Originally committed as revision 14804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:32:50 +00:00
Michael Niedermayer
a50bd69d9d fix includes 
Originally committed as revision 14803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:32:13 +00:00
Michael Niedermayer
7a0d00d49e Principal component analysis 
(will be cleaned up in next commits)

Originally committed as revision 14802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-17 15:28:12 +00:00