Commit Graph

71 Commits

Author SHA1 Message Date
Michael Niedermayer c3b6cc61e5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffserver: remove unused variable.
  Remove unused and outdated TODO file.
  gitignore: Drop individual .d ignore; it is already covered by a wildcard.
  lavf: deprecate AVStream.quality.
  bink: pass Bink version to audio decoder through extradata instead of codec_tag.
  libpostproc: Remove disabled code.
  flashsv: improve some comments and fix some wrong ones
  flashsv: Eliminate redundant variable indirection.
  flashsv: set reference frame type to full frame
  flashsv: replace bitstream description by a link to the specification
  flashsv: convert a debug av_log into av_dlog
  flashsv: simplify condition
  flashsv: return more meaningful error values
  flashsv: cosmetics: break some overly long lines
  flashsv: cosmetics: drop some unnecessary parentheses
  swscale: amend documentation to mention use of native depth for scaling.
  eval: add missing comma to tests.
  eval: fix memleak.
  H.264: make loopfilter bS const where applicable

Conflicts:
	libavcodec/binkaudio.c
	libavformat/bink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-06 23:57:11 +02:00
Diego Biurrun 0fedf754b2 libpostproc: Remove disabled code. 2011-07-06 13:43:19 +02:00
Piotr Kaczuba c96f3750c2 postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
Piotr Kaczuba 84fb4e9df7 postprocess.c: filter name needs to be double 0 terminated 2011-05-31 17:50:46 +02:00
Michael Niedermayer ea535ed50d Revert 1a5e4fd8c5 for postproc. This broke the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-29 00:32:33 +02:00
Michael Niedermayer 6841c8c579 Merge remote branch 'qatar/master'
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-09 04:50:56 +02:00
Alex Converse c38d9780eb cosmetics: trim trailing whitespace in postproc 2011-05-08 13:33:23 -07:00
Michael Niedermayer b000b86e1d Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 03:30:24 +02:00
Alex Converse 1a5e4fd8c5 Replace strncpy() with av_strlcpy(). 2011-05-03 21:20:13 -07:00
Diego Biurrun a81ff195c1 libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
Michael Niedermayer 8ea36711b0 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not Pulled:
    commit 42cfb3835b
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
2011-03-19 20:05:11 +01: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
Janne Grunau faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Michael Niedermayer e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit 29ba091136.
2011-03-17 17:26:45 +01:00
Michael Niedermayer 0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit a03be6e1ba.
2011-03-17 17:26:45 +01:00
Janne Grunau a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau 29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01: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
Stefano Sabatini 4160069067 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
XXX_license() functions, consistent with the rest of FFmpeg.

Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-03 14:31:25 +00:00
Diego Biurrun c173693698 Add functions to return library license and library configuration.
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-18 17:15:17 +00:00
David Conrad ef516f7377 Move ALIGN macro to libavutil/common.h and use it in various places
Originally committed as revision 18898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-22 21:32:13 +00:00
Ramiro Polla e90f5b5ab1 configure: Add --enable-runtime-cpudetect
Originally committed as revision 18380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 20:26:18 +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
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
Diego Biurrun bbea3555ec Remove pointless malloc.h #include.
Originally committed as revision 16238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-19 09:59:18 +00:00
Diego Biurrun 7dfea3420f Drop _t from typedef names for POSIX compatibility.
Originally committed as revision 16062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 20:06:16 +00:00
Diego Biurrun fe9e9d6020 Do not set COMPILE_C if AltiVec is enabled without runtime CPU detection.
Gets rid of the following warning:
postprocess_template.c:3271: warning: ‘postProcess_C’ defined but not used

Originally committed as revision 16055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 16:44:22 +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
Stefano Sabatini 2a4a62bffc Implement postproc_version().
Originally committed as revision 15148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 18:00:53 +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 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
Diego Biurrun 0866c56f0a Remove redundant ARCH_POWERPC #ifdef around HAVE_ALTIVEC.
Originally committed as revision 12495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-18 22:14:41 +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
Diego Biurrun 216d513c34 typos
Originally committed as revision 12443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 21:50:23 +00:00
Diego Biurrun 2cab640129 typo fixes
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 23:58:46 +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
Reimar Döffinger 2722e36265 Missed a variable in postprocess.c that should use DECLARE_ASM_CONST as well
Originally committed as revision 11670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 18:30:17 +00:00
Reimar Döffinger 2b858d0b99 Simplify: use DECLARE_ASM_CONST
Originally committed as revision 11669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 18:21:01 +00:00
Diego Pettenò fb83ea6417 Make MMX vectors constants.
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 10:18:00 +00:00
Diego Pettenò 69fdc40db7 Make pp_help a constant array of characters to move it to .rodata.
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 10:16:36 +00:00
Diego Pettenò 649537438e Reduce the size of the replaceTable entries.
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 10:15:07 +00:00
Diego Pettenò 9656df7994 Remove clip_table as it is not used anymore.
Patch by Diego 'Flameeyes' Pettenò (flameeyes gmail com)

Originally committed as revision 11468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 22:03:30 +00:00
Diego Pettenò 31bfd6f34f Make the av_class member of PPContext a poiner to constant AVClass.
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 12:44:49 +00:00
Diego Pettenò 10ff3ff43b Make pp_help a constant pointer to constant characters, moves it partially
in .rodata (the actual string) and partially in .data.relro (the pointer),
but doesn't change ABI.
Patch by Diego 'Flameeyes' Pettenò  flameeyes at gmail com

Originally committed as revision 11390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 07:47:32 +00:00
Diego Pettenò ca32534337 Make pp_get_mode_by_name_and_quality accept a constant string.
Patch by Diego 'Flameeyes' Pettenò  flameeyes at gmail com

Originally committed as revision 11381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 08:42:02 +00:00
Diego Pettenò a89889164c Make filterDelimiters and optionDelimiters two static constant array of
characters, should move them to .rodata.
Patch by Diego 'Flameeyes' Pettenò flameeyes § gmail dot com

Originally committed as revision 11380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 08:39:38 +00:00
Diego Biurrun 3b7660b002 Remove mangle.h, it is just a duplicate of parts of libavutil/internal.h.
Originally committed as revision 9500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 10:45:53 +00:00