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

18 Commits

Author SHA1 Message Date
Michael Niedermayer 1d186e9e12 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
  swscale: use 15-bit intermediates for 9/10-bit scaling.
  dct32: Add SSE2 ASM optimizations
  Correct chroma vector calculation for RealVideo 3.
  lavf: Add an option to discard corrupted frames
  mpegts: Mark wrongly-sized packets as corrupted
  mpegts: Move scan test to handle_packets
  mpegts: Mark corrupted packets
  mpegts: Reset continuity counter on seek
  mpegts: Fix for continuity counter
  mpegts: Silence "can't seek" warning on unseekable
  apichange: add an entry for AV_PKT_FLAG_CORRUPT
  avpacket: signal possibly corrupted packets
  mpeg4videodec: remove dead code that would have detected erroneous encoding
  aac: Remove some suspicious illegal memcpy()s from LTP.
  bink: Eliminate unnecessary shadow declaration.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/options.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-02 22:12:18 +02:00
Vitor Sessak 18b131de04 dct32: Add SSE2 ASM optimizations 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-02 10:17:29 -07:00
Vitor Sessak e6c1791b47 Fix compilation with --disable-yasm. 2011-05-22 13:41:13 +02:00
Vitor Sessak 165c7c420d Fix dct32() compilation with --disable-yasm 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-22 07:10:19 -04:00
Michael Niedermayer bf8bb94322 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 04:53:19 +02:00
Vitor Sessak 6204feb160 dct32: Add AVX implementation of 32-point DCT 2011-05-21 17:42:26 +02:00
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 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 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Loren Merritt 11ab1e409f FFT: factor a shuffle out of the inner loop and merge it into fft_permute. 
6% faster SSE FFT on Conroe, 2.5% on Penryn.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e6b1ed693a)
 2011-02-14 23:58:19 +01:00
Loren Merritt e6b1ed693a FFT: factor a shuffle out of the inner loop and merge it into fft_permute. 
6% faster SSE FFT on Conroe, 2.5% on Penryn.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-13 15:36:39 +01:00
Stefano Sabatini c6c98d0897 Move mm_support() from libavcodec to libavutil, make it a public 
function and rename it to av_get_cpu_flags().

Originally committed as revision 25076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 15:07:14 +00:00
Stefano Sabatini 7160bb716b Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_ 
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.

Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-04 09:59:08 +00:00
Vitor Sessak 881fd7a62f Move SSE optimized 32-point DCT to its own file. Should fix breakage with YASM 
disabled.

Originally committed as revision 24078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-06 17:48:23 +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
Måns Rullgård f486321395 Move per-arch fft init bits into the corresponding subdirs 
Originally committed as revision 19864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 21:14:14 +00:00