virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
50,658 Commits 37 Branches 400 Tags 462 MiB
9e73f6d1f9
Commit Graph

28 Commits

Author SHA1 Message Date
Michael Niedermayer
a984efd104 Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' 
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-26 13:05:10 +01:00
Diego Biurrun
c242bbd8b6 Remove unnecessary dsputil.h #includes 2013-02-26 00:51:34 +01:00
Michael Niedermayer
6c38884876 Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 13:27:24 +01:00
Diego Biurrun
c9f933b5b6 Add av_cold attributes to arch-specific init functions 2013-02-05 17:01:05 +01:00
Michael Niedermayer
ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-23 17:44:56 +01:00
Diego Biurrun
88bd7fdc82 Drop DCTELEM typedef 
It does not help as an abstraction and adds dsputil dependencies.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2013-01-22 18:32:56 -08:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Martin Storsjö
efd29844eb mpegvideo: Add ff_ prefix to nonstatic functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:23 +02: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
9dbd3ed6c3 Alpha: factor common parts from dct_unquantize_h263_intra/inter_axp 
Originally committed as revision 16661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 21:44:58 +00:00
Måns Rullgård
1617220799 Alpha: fix dct_unquantize_h263_inter/intra_axp() 
Originally committed as revision 16660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 21:44:56 +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
Ronald S. Bultje
b550bfaa61 Add libavcodec to compiler include flags in order to simplify header 
include paths in the source files.
mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-16 09:51:45 +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
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
7e491fa5f9 remove unused variables 
Originally committed as revision 4738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:42:06 +00:00
Michael Niedermayer
2393e65431 100l (forgot alpha & ppc) 
Originally committed as revision 2611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-15 09:21:28 +00:00
Falk Hüffner
f7728bf61c Use asms instead of builtins when compiling for generic Alpha. Less 
ugly.

Originally committed as revision 2270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-13 10:07:46 +00:00
Michael Niedermayer
b0368839ac MpegEncContext.(i)dct_* -> DspContext.(i)dct_* 
bitexact cleanup

Originally committed as revision 1617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-03 14:54:00 +00:00
Falk Hüffner
8b313a4787 Move Alpha optimized IDCT to own file. Based on a patch by Måns 
Rullgård <mru@users.sourceforge.net>.

I've left out the idctCol2 part, because W4 has recently been decreed
to be 16383, and also I doubt it will give a noticeable speedup.

Originally committed as revision 1029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-11 23:01:16 +00:00
Falk Hüffner
acd2e05c47 * Fix dct_unquantize_h263_axp for changed block_last_index indexing. 
* Set qadd to 0 for intra with h263_aic (whatever that may be).

Originally committed as revision 1009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-07 02:03:21 +00:00
Falk Hüffner
6c38306600 Make compilable again after DCT cleanup. It gives wrong results, 
though, so I disabled it for now. Anybody knows offhand what might be
the reason?

Originally committed as revision 1005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-05 00:57:42 +00:00
Falk Hüffner
2dbe7ec87c Make dct_unquantize_h263 work on systems without MVI extension. 
Originally committed as revision 715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-03 23:30:32 +00:00
Falk Hüffner
e0580f8c68 Update and activate dct_unquantize_h263_mvi. Thanks to Måns Rullgård 
for some improvements.

Originally committed as revision 714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-03 03:01:06 +00:00
Falk Hüffner
db42e13bfb Ugly hack to make the assembler accept MVI instructions. 
Originally committed as revision 705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-24 22:22:39 +00:00
Fabrice Bellard
ff4ec49e64 license/copyright change 
Originally committed as revision 599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-25 22:45:33 +00:00
Nick Kurshev
1e98dffb7a Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de> 
Originally committed as revision 274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-01-20 14:48:02 +00:00