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

37 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
Vitor Sessak 9d35fa520e Add AVX FFT implementation. 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-04-26 18:25:24 +02:00
Michael Niedermayer d4a50a2100 Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-21 03:33:28 +01:00
Mans Rullgard 4538729afe Move sine windows to a separate file 
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 13:25:19 +00:00
Mans Rullgard 26f548bb59 fft: remove inline wrappers for function pointers 
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 19:49:18 +00: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
Justin Ruggles a8ae4e0e7b Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 80ba1ddb58)
 2011-02-02 03:40:48 +01:00
Justin Ruggles 80ba1ddb58 Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 20:28:42 +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
Diego Elio Pettenò ee7fed27d4 Rename sf_table in atrac.c unit to ff_atrac_sf_table. 
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 82e1f217f2)
 2011-01-26 03:43:29 +01:00
Diego Elio Pettenò 82e1f217f2 Rename sf_table in atrac.c unit to ff_atrac_sf_table. 
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-24 23:43:41 +00:00
Stefano Sabatini 5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Ronald S. Bultje b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder 
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:57:48 +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 da0ac0ee64 Make some functions static 
These functions are not used outside their respective files, and they
lack a prototype in a header.

Originally committed as revision 22259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:41 +00:00
Måns Rullgård 1429224b04 Move FFT parts from dsputil.h to fft.h 
Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:34:46 +00:00
Måns Rullgård 84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros 
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:24:59 +00:00
Måns Rullgård c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Reimar Döffinger 14b8607065 Add support for hard-coded MDCT-related ff_sine_windows tables. 
Originally committed as revision 21108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 13:28:04 +00:00
Vitor Sessak f49bcde63b Reindent code folowing previous commit (r20019) 
Originally committed as revision 20020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 21:26:35 +00:00
Vitor Sessak b11d40d12e Factorize duplicated code in at1_imdct_block() 
Originally committed as revision 20019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 21:24:58 +00:00
Benjamin Larsson e704b012f2 Mention SDDS so search engines will pick it up for when someone 
needs to decode the SDDS tracks found on 35 mm movies.

Originally committed as revision 19968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 17:05:19 +00:00
Benjamin Larsson edd897b1b3 Use ff_sine_32 in atrac1. 
Originally committed as revision 19967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 17:03:28 +00:00
Benjamin Larsson 9caab87829 Add forgotten cleanup function in atrac1. 
Originally committed as revision 19954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 21:00:18 +00:00
Benjamin Larsson 78b3a12d9c Cosmetics, indentation. 
Originally committed as revision 19953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:53:29 +00:00
Benjamin Larsson a872e5c1f4 Cosmetics. Merge declaration and initialization. 
Originally committed as revision 19952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:52:24 +00:00
Benjamin Larsson b6a237025d Move the scale factor and word length indexes to the stack. 
Originally committed as revision 19951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:49:08 +00:00
Måns Rullgård 01b2214758 Merge FFTContext and MDCTContext 
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-20 17:30:20 +00:00
Diego Biurrun ec129499b8 Fix embarassing typo in last commit: Restore mistakenly removed ','. 
Originally committed as revision 19930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-20 17:18:59 +00:00
Diego Biurrun 1e1898c00f K&R coding style whitespace cosmetics 
Originally committed as revision 19929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-20 17:16:12 +00:00
Benjamin Larsson 803d8488f2 Align sample output buffer in atrac1. 
Originally committed as revision 19918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-19 01:46:03 +00:00
Benjamin Larsson 0105f49792 Fix the short block transform for atrac1. 
Originally committed as revision 19917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-19 01:45:00 +00:00
Benjamin Larsson 10634c037a Only use one mdct window size in atrac1. 
Originally committed as revision 19900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:52:11 +00:00
Benjamin Larsson 04a6d1b0db Cosmetics. Renames, indentation and spacing. 
Originally committed as revision 19832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 18:05:14 +00:00
Benjamin Larsson dbb0f96f0f Initial commit of the atrac1 decoder, not hooked up yet 
Originally committed as revision 19811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 18:47:02 +00:00