Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-10-31 15:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
35865 commits 38 branches 411 tags 239 MiB
Commit graph

40 commits

Author SHA1 Message Date
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Michael Niedermayer
e834f7d2bb postproc: remove stray + 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 18:11:09 +01:00
Michael Niedermayer
3419d9b891 postproc: fix compilation failure, now really 
forgot git add ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 01:51:35 +02:00
Yuriy Kaminskiy
d16ebec795 postproc: Fix compilation failure. 
libpostproc/postprocess_template.c: In function 'dering_MMX2':
libpostproc/postprocess_template.c:1045:5: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
libpostproc/postprocess_template.c:1045:5: error: 'asm' operand has impossible constraints
 2011-09-24 01:37:52 +02:00
Yuriy Kaminskiy
2b2617da6b libpostproc: mmx code uses stack below %esp, fix that 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 21:37:00 +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
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38: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
Yuriy Kaminskiy
5d39be73cb Fix warnings about redefining constants when compiling libpostproc. 
Patch by Yuriy Kaminskiy, yumkam mail ru

Originally committed as revision 21607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-02 19:35:52 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Diego Biurrun
386eaeb43f Remove disabled code cruft. 
Originally committed as revision 19668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-19 08:15:32 +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
ebc3209a7d HAVE_3DNOW --> HAVE_AMD3DNOW to sync with latest configure changes. 
Originally committed as revision 16787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 19:57:52 +00:00
Carl Eugen Hoyos
ff5d91d9a1 Fix compilation. 
Originally committed as revision 16592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 00:44:42 +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
Reimar Döffinger
7cebed70a8 Replace long with x86_reg in postprocess_template.c like in all other 
x86 assembler code files, just libpostprocess was forgotten.

Originally committed as revision 15767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-02 18:59:44 +00:00
Diego Pettenò
be449fca79 Convert asm keyword into __asm__. 
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.

Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-16 13:34:09 +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
Diego Biurrun
aa089f6c05 typo fixes: tempBlured --> tempBlurred 
Originally committed as revision 12557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 17:36:31 +00:00
Diego Biurrun
04932b0d97 cosmetics: typo fixes 
Originally committed as revision 12554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:46:36 +00:00
Diego Biurrun
a94948d327 cosmetics: Fix typo in variable name, numSkiped --> numSkipped. 
Originally committed as revision 12553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:43:07 +00:00
Diego Biurrun
16e0bf7349 cosmetics: Fix indentation to be 4 spaces and consistently place {}. 
Originally committed as revision 12552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 15:46:34 +00:00
Måns Rullgård
6fcc9af012 simplify ALIGN_MASK definition 
Originally committed as revision 12483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 23:44:46 +00:00
Måns Rullgård
b55aa9a904 get register names from x86_cpu.h 
Originally committed as revision 12482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 23:08:19 +00:00
Diego Biurrun
bd10713636 typo fixes 
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:15:47 +00:00
Michael Niedermayer
6c51fd3f2b const 
Originally committed as revision 11816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-02 21:24:54 +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
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Reimar Döffinger
0bda781739 Use DECLARE_ALIGNED for alignment in libpostprocess 
Originally committed as revision 9043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-17 09:30:38 +00:00
Diego Biurrun
e42dba481f typos/grammar 
Originally committed as revision 8641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 14:09:20 +00:00
Diego Biurrun
57177f648d cosmetics: Fix another common typo, gurantee --> guArantee. 
Originally committed as revision 8054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-21 19:19:46 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h 
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-08 00:35:08 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +00:00
Diego Biurrun
02305ff38f Rename SIGN macro to FFSIGN to avoid clashes with system headers. 
Originally committed as revision 6665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 22:59:37 +00:00
Diego Biurrun
e7becfb25f printf --> av_log with some help from Oded 
Originally committed as revision 6639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 00:18:33 +00:00
Diego Biurrun
8925915fcc Change libpostproc to use the FFMIN/FFMAX macros from libavutil. 
Originally committed as revision 6622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-10 08:09:12 +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
6d9a242106 libavcodec/libpostproc ---> libpostproc 
Originally committed as revision 5440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-01 21:37:48 +00:00
Renamed from libavcodec/libpostproc/postprocess_template.c (Browse further)