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

24 Commits

Author SHA1 Message Date
Michael Niedermayer 80d156d7fd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
	libavcodec/h264.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-20 05:48:22 +02:00
Mans Rullgard c4f5c2d6f4 Move some mpegaudio functions to new mpegaudiodsp subsystem 
This separation allows these functions to be used in a cleaner
fashion from other codecs (e.g. qdm2) and simplifies creating
optimised versions of them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-19 12:25:34 +01:00
Michael Niedermayer b4bcd1e2f1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
	ffpresets/libx264-fast.ffpreset
	ffpresets/libx264-fast_firstpass.ffpreset
	ffpresets/libx264-faster.ffpreset
	ffpresets/libx264-faster_firstpass.ffpreset
	ffpresets/libx264-medium.ffpreset
	ffpresets/libx264-medium_firstpass.ffpreset
	ffpresets/libx264-placebo.ffpreset
	ffpresets/libx264-placebo_firstpass.ffpreset
	ffpresets/libx264-slow.ffpreset
	ffpresets/libx264-slow_firstpass.ffpreset
	ffpresets/libx264-slower.ffpreset
	ffpresets/libx264-slower_firstpass.ffpreset
	ffpresets/libx264-superfast.ffpreset
	ffpresets/libx264-superfast_firstpass.ffpreset
	ffpresets/libx264-ultrafast.ffpreset
	ffpresets/libx264-ultrafast_firstpass.ffpreset
	ffpresets/libx264-veryfast.ffpreset
	ffpresets/libx264-veryfast_firstpass.ffpreset
	ffpresets/libx264-veryslow.ffpreset
	ffpresets/libx264-veryslow_firstpass.ffpreset
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-18 05:42:42 +02:00
Mans Rullgard 4bac1bbc3b mpegaudio: add _fixed suffix to some names 
This adds a _fixed suffix to the fixed-point versions of things
with both float and fixed-point variants.  This makes it more
consistent with other dual-implementation things, e.g. fft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-17 20:17:36 +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
Kostya Shishkov 7d3829a87a Musepack SV8 supports "mono" files (though it still codes them as stereo), 
so extend decoder to output only one channel for it.

This fixes issue 2368.

Originally committed as revision 25790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 20:42:06 +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
Reimar Döffinger 9adcccde0c mpegaudiodec, mpc and qdm2 all use the same mpa_synth window, so make 
them use the same variable/global storage.
Saves 4 kB in .bss.

Originally committed as revision 20314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 17:21:02 +00:00
Stefano Sabatini 9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Kostya Shishkov 74e2a0784e Make Musepack decoders use LFG pseudorandom generator 
Originally committed as revision 17880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 16:37:57 +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 dc8a7c93d3 Add missing void keyword to parameterless function declarations. 
Originally committed as revision 16860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 18:38:25 +00:00
Diego Biurrun ad1eebe360 Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection. 
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 00:48:17 +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 245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Kostya Shishkov 24e649afe3 Split Musepack decoder into SV7 decoder and synth core 
(for upcoming SV8 decoder)

Originally committed as revision 10905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-02 06:40:42 +00:00
Diego Biurrun e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Diego Biurrun 9636c4de32 Remove unused variable. 
Originally committed as revision 8994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-11 07:07:00 +00:00
Diego Biurrun 5a6a6cc7dc Fix multiple "‘inline/static’ is not at beginning of declaration" warnings. 
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-05 12:18:14 +00:00
Kostya Shishkov e4cc43625f Use AVRandom 
Originally committed as revision 8004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-17 11:41:59 +00:00
Kostya Shishkov eeb40eb367 10l: forgot break statement 
Originally committed as revision 8003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-17 11:39:54 +00:00
Reimar Döffinger a5ee04c3e0 Buffer for get_bits must be padded because readers may overread. 
Originally committed as revision 7477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 16:11:10 +00:00
Kostya Shishkov aac88b534c Decode previous 32 frames to avoid seeking artifacts in MPC 
Originally committed as revision 7393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-01 05:32:27 +00:00
Kostya Shishkov 185c7b6b26 Musepack SV7 decoding support 
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-24 04:51:43 +00:00