virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
44,432 Commits 37 Branches 400 Tags 465 MiB
75f3e0ad95
Commit Graph

18 Commits

Author SHA1 Message Date
Michael Niedermayer
7beadfe1f7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mov_chan: Only set the channel_layout if setting it to a nonzero value
  mov_chan: Reindent an incorrectly indented line
  mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
  x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
  x86: more specific checks for availability of required assembly capabilities
  x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
  fate: Drop redundant setting of FUZZ to 1
  cavsdsp: set idct permutation independently of dsputil
  x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 12:53:44 +02:00
Mans Rullgard
6efb698883 cavsdsp: set idct permutation independently of dsputil 
CAVS uses its own idct so using dsputil to set the permutation
is fragile.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-07 11:42:35 +01:00
Michael Niedermayer
c581cb4e4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-16 16:20:30 +02:00
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-15 22:32:06 +03: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
Måns Rullgård
3d1b1caa6b Remove duplicate definitions of fullpel MC functions 
This removes duplicated definitions of 8x8 and 16x16 fullpel MC
functions with various names reducing dsputil.o by 8k on x86_64.

Originally committed as revision 24933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 20:14:21 +00:00
Måns Rullgård
f079a64aea Move cavs dsp functions to their own struct 
Originally committed as revision 24685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-03 20:59:00 +00:00
Måns Rullgård
965363f81a Move some dsp func prototypes to dsputil.h; they are defined in dsputil.c 
Originally committed as revision 22264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:59 +00:00
Zuxy Meng
0752cd39d2 More av_cold for infrequently called functions. 
Originally committed as revision 21179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 02:16:00 +00:00
Stefan Gehrer
e090c70f2f avoid duplicating dsputil's clear_block 
Originally committed as revision 17135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 16:45:02 +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
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl 
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 20:08:09 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Stefan Gehrer
595e7bd940 some MMX optimizations for the CAVS decoder 
Originally committed as revision 5846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 08:45:33 +00:00
Michael Niedermayer
05e7e64d1a add rounding bias earlier in the idct, avoids many adds 
Originally committed as revision 5618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-04 22:43:35 +00:00
Michael Niedermayer
b482e2d12f CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de) 
Originally committed as revision 5590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-03 00:16:45 +00:00
Michael Niedermayer
0abc2e73f8 new files for the CAVS decoder by (Stefan Gehrer <stefan gehrer gmx de) 
Originally committed as revision 5567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-01 22:52:56 +00:00