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

20 Commits

Author SHA1 Message Date
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 6f2309ed2e dct: build dct32 as separate object files 
This builds the float and fixed-point versions of dct32 separately
instead of #including the file in dct.c and mpegaudiodec.c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-17 13:57:23 +01:00
Michael Niedermayer f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-17 04:51:33 +02:00
Mans Rullgard 9503fbb859 dct: fix indentation 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-16 16:20:27 +01:00
Mans Rullgard 721d6f2dc5 dct: bypass table allocation for DCT_II of size 32 
The size-32 DCT_II has a special implementation which doesn't use
the normal tables.  Skipping allocation of these in this case saves
some memory.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-16 16:20:18 +01: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 8eec00278c dct: remove superflous #include 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 17:15:41 +00:00
Mans Rullgard 0aded9484d Move dct and rdft definitions to separate files 
This leaves fft.h with only the core FFT and MDCT definitions
thus making it more managable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 17:15:33 +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
Vitor Sessak 4dcc4f8eaa SSE optimized 32-point DCT 
Originally committed as revision 24077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-06 16:58:54 +00:00
Vitor Sessak 06d01188e9 More mp{1,2,3} 32-point DCT transform to our common DCT framework. 
Should allow for future SIMD optimizations.

Originally committed as revision 23912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 20:11:27 +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
Vitor Sessak e1484ebed6 Implement the discrete sine/cosine transforms DCT-I and DST-I 
Originally committed as revision 22649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 19:48:16 +00:00
Vitor Sessak b531e1ab59 Reindent after r22618. 
Originally committed as revision 22619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 11:36:17 +00:00
Vitor Sessak 8305c76b53 Split DCT-II and DCT-III in different functions, they do not share any code. 
Originally committed as revision 22618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 11:35:05 +00:00
Vitor Sessak e30ab38e94 Call DCT by function pointer. Needed for any future ASM implementation and 
allows further cleanup.

Originally committed as revision 22617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 11:31:11 +00:00
Vitor Sessak 89d7df7c74 Cosmetics: move ff_dct_init() to the bottom of the file 
Originally committed as revision 22616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-21 11:28:38 +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
Vitor Sessak 7f3f5f46c2 Floating point discrete cosine transform 
Originally committed as revision 21338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 00:39:47 +00:00