1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

120 Commits

Author SHA1 Message Date
Michael Niedermayer
094a496818 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fifo: add FIFO API test program, and fate test
  fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
  postprocess.c: filter name needs to be double 0 terminated
  doxygen: fix wrong comment syntax, //< vs. ///<
  doxygen: drop pointless star from pointer variable names
  Replace deprecated av_find_stream_info() by avformat_find_stream_info().
  xmv: eliminate superfluous zeroing of zero data
  configure: fix typo in avconv dependency list

Conflicts:
	configure
	doc/APIchanges
	libavutil/Makefile
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-26 23:18:54 +02:00
Stefano Sabatini
1717ba0cdd fifo: add FIFO API test program, and fate test
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-26 20:54:36 +02:00
Michael Niedermayer
58257ea29e Merge remote-tracking branch 'qatar/master'
* qatar/master: (28 commits)
  mp3enc: write a xing frame containing number of frames in the file
  lavf: update AVStream.nb_frames when muxing.
  ffmpeg: remove unused variables from InputStream.
  doc: update ffmpeg -ar and -ac documentation to reflect reality.
  ffmpeg: remove pointless if (nb_input_files)
  ffmpeg: merge input_files_ts_offset into input_files.
  ffmpeg: merge input_codecs into input_streams.
  ffmpeg: drop AV prefixes from struct names.
  ffmpeg: deprecate loop_input and loop_output options
  gif: add loop private option.
  img2: add loop private option.
  AVOptions: in av_opt_find() don't return named constants unless unit is specified.
  x11grab: replace undocumented nomouse hackery with a private option.
  dict: extend documentation.
  lls: whitespace cosmetics
  docs: Use proper markup for a literal command line option
  docs: Remove a remark that isn't relevant any longer
  docs: Explain how to regenerate import libraries with MSVC tools
  docs: Mention that libraries for MSVC can be built with a cross compiler
  docs: Remove old docs that mention setting up a build environment with lib.exe
  ...

Conflicts:
	doc/ffmpeg.texi
	doc/general.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/dnxhddata.c
	libavformat/mp3enc.c
	libavformat/utils.c
	libavutil/Makefile
	tests/copycooker.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 02:06:40 +02:00
Diego Biurrun
4904995652 avutil: Add missing test programs to Makefile. 2011-07-08 00:17:19 +02:00
Mans Rullgard
cfa68a3381 Remove unused, never built libavutil/pca.[ch]
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 23:49:03 +01:00
Michael Niedermayer
bb9d5171a7 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  swscale: Add Doxygen for hyscale_fast/hScale.
  fate: enable lavfi-pixmt tests on big endian systems
  PPC: swscale: disable altivec functions for unsupported formats
  fate: merge identical pixdesc_be/le tests
  swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
  build: call texi2pod.pl with full path instead of symlink
  build: include sub-makefiles using full path instead of symlinks
  swscale: update big endian reference values after dff5a835.
  wavpack: skip blocks with no samples
  cosmetics: remove outdated comment that is no longer true
  build: replace some addprefix/addsuffix with substitution refs
  avutil: Remove unused arbitrary precision integer code.
  configure: Drop check for availability of ten assembler operands.
  aacenc: Save channel configuration for later use.
  aacenc: Fix codebook trellising for zeroed bands.
  swscale: change prototypes of scaled YUV output functions.
  swscale: re-add support for non-native endianness.
  swscale: disentangle yuv2rgbX_c_full() into small functions.
  swscale: split yuv2packed[12X]_c() remainders into small functions.
  swscale: split yuv2packedX_altivec in smaller functions.
  ...

Conflicts:
	Makefile
	configure
	libavcodec/x86/dsputil_mmx.c
	libavfilter/Makefile
	libavformat/Makefile
	libavutil/integer.c
	libavutil/integer.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Reimar Döffinger
1109680434 Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
This reverts commit a6213f3dce.
2011-06-26 09:49:36 +02:00
Diego Biurrun
a6213f3dce build: Remove redundant config.mak includes from subdirectory Makefiles.
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
2011-06-25 13:02:51 +02:00
Anton Khirnov
d9f80ea2a7 Move metadata API from lavf to lavu.
Rename it to AVDictionary, since it will be used as such.  Tags
documentation and metadata conversion API is lavf-specific, so remains
there.
2011-06-08 07:43:45 +02:00
Mans Rullgard
5a4a71257c Fix build of eval-test program
eval.c has moved to libavutil, move the TESTPROGS entry too.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-05 11:47:14 +01:00
Diego Biurrun
bea705752d Remove unused softfloat implementation.
The softfloat functionality is unused, not installed and incomplete.
On platforms without floating point units, the compiler provides a softfloat
implementation so there is no point in carrying this code around locally.
2011-05-11 13:43:30 +02:00
Anton Khirnov
488d2b6349 lavu: remove disabled sha1 cruft. 2011-04-19 21:50:10 +02:00
Alexis Ballier
a3a0af4fb1 avutil: make aes and sha api public
The functions are already av_ prefixed and sha1 header is already provided.
Install libavutil/{aes,sha}.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-04-14 22:14:30 +02:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
0328b9ea39 Add av_file_map() and av_file_unmap() functions.
Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22 14:13:04 +00:00
Stefano Sabatini
4ddade62dd Install libavutil/opt.h, its API is public.
Fix issue #2265.

Originally committed as revision 25420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 23:42:25 +00:00
Måns Rullgård
b64b4134d5 Rename libavutil/assert.h to avassert.h
This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 13:55:13 +00:00
Michael Niedermayer
b926b6282d av_assert() system.
With this the developer can now choose if he wants an assert always enabled or at which
compile time assert level. This can thus replace the #define NDEBUG hacks

Originally committed as revision 25278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 21:57:31 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 14:25:22 +00:00
Måns Rullgård
9275438a19 Clean up av_get_cpu_flag()
Instead of defining functions in per-arch header files included
by the main cpu.c, define them normally and call them from the
generic one.

Originally committed as revision 25084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-09 18:51:45 +00: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
Diego Pettenò
3fc548df28 Make ff_inverse stay with libavutil, and optional copy it to libavcodec.
The ff_inverse table is used by FASTDIV macro, defined in libavutil, but up
to now the table was defined only in libavcodec.

After this change, the main copy of ff_inverse is part of libavutil (just
like FASTDIV), but if CONFIG_SMALL is unset, then a different copy is made
available to libavcodec, to avoid the performance penalty of using an
external look up table.

Dynamic linking works, because the libraries are linked with -Bsymbolic, so
the local copy of the symbol has priority over the external; static linking
works because the table is on a standalone object file in both libraries,
so the linker is able to discard one of the two.

Tested on Linux/x86-64 and Mac OS X/x86-64.

Originally committed as revision 24383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 12:37:37 +00:00
Måns Rullgård
b91d08f4a3 Install bswap.h and intreadwrite.h
Originally committed as revision 24174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:22:07 +00:00
Ramiro Polla
89eec74a52 avutil: install lfg.h
Originally committed as revision 23985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:12:06 +00:00
Stefano Sabatini
0b99215c0e Move eval.c and eval.h from libavcodec to libavutil, and make the eval
API public.

Originally committed as revision 23485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 12:01:28 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 08:53:40 +00:00
Stefano Sabatini
87958234f9 Implement av_strerror().
Originally committed as revision 22684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:46:35 +00:00
Stefano Sabatini
60c144f700 Move error code definitions from libavcodec/avcodec.h to
libavutil/error.h.

Error code definitions and handling code belong to libavutil, where
they can be shared by all the libav* libraries.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move error codes definitions from lavc to lavu
Date: Sun, 19 Jul 2009 12:09:16 +0200

Originally committed as revision 22501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 09:43:24 +00:00
Måns Rullgård
2791730dbf Move gcc attribute macros to new header libavutil/attributes.h
Originally committed as revision 22346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 21:28:56 +00:00
Måns Rullgård
f89c14027a checkheaders: skip per-arch headers not meant for direct inclusion
Some of the per-arch headers are only meant to be used through
the parent header of the same name.  Testing these standalone
does not make sense.

Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:17:47 +00:00
Måns Rullgård
a3e02a8cad Create and install libavutil/avconfig.h
This file contains a safe subset of the config.h settings.
Only bigendian is included for now, more can be added as
need arises.

Originally committed as revision 21321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 04:40:16 +00:00
Stefano Sabatini
74a0059f2c Make the pixdesc API public.
Originally committed as revision 20603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-24 23:33:41 +00:00
Kostya Shishkov
451ae25724 Prepare SHA code to handle SHA-2 as well. For now rename files and functions
and leave av_sha1_* functions for compatibility until next major bump.

Originally committed as revision 19394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 15:50:49 +00:00
Diego Biurrun
9d58d4717a cosmetics: Add missing ending backslash to installed header list.
Originally committed as revision 19135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 07:18:58 +00:00
Diego Biurrun
e467369278 Add a configure check for lzo1x_999_compress() and compile the lzo test program
in libavutil when this function is available.

Originally committed as revision 18386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 14:55:05 +00:00
Diego Biurrun
a8f9e7f641 Fix lzo-test linking: -llzo2 should be in ELIBS, not EXTRALIBS.
Originally committed as revision 18320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 22:41:58 +00:00
Diego Biurrun
3344cf851c Use a wildcard match instead of a list to remove test programs.
This is robust against renames and also removes test programs not
(yet) hooked up in the main Makefiles.

Originally committed as revision 18193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26 10:12:21 +00:00
Diego Biurrun
7304c2c4ce Move adding the '-test$(EXESUF)' suffix to test programs into common.mak.
Originally committed as revision 18189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 18:19:20 +00:00
Diego Biurrun
661ce28996 Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists.

Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 23:13:21 +00:00
Diego Biurrun
ee6624ef4a Remove deprecated and now unused Mersenne Twister PRNG.
Originally committed as revision 18116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 17:28:38 +00:00
Michael Niedermayer
792e467904 Remove the Mersenne Twister from the public API/ABI.
We provide better PRNGs.

Originally committed as revision 17872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:35:13 +00:00
Baptiste Coudurier
48d58e592a add ff_random_get_seed to be used in conjunction with random functions
Originally committed as revision 17868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 01:28:14 +00:00
Stefano Sabatini
04331dea2a Split avutil.h, move all the pixel format definitions to the new
dedicated file pixfmt.h.

Originally committed as revision 17528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 14:27:50 +00:00
Stefano Sabatini
21eff9ced7 Add a new test program for base64, based on that removed in r17024.
See the thread:
"[PATCH] remove unused and broken test program in libavutil/base64.c".

Originally committed as revision 17025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-06 23:29:25 +00:00
Diego Biurrun
4d55404fca Rename string.c to avstring.c so that the name of header and C file match.
Originally committed as revision 16853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-29 22:12:36 +00:00
Diego Biurrun
7b5e8a274a Extend 'checkheaders' target to architecture-specific subdirectories.
Originally committed as revision 16559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:48:07 +00:00
Diego Biurrun
f0e602351e cosmetics: Consistently place HEADERS before OBJS in all Makefiles.
Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:53:18 +00:00
Måns Rullgård
ede725104b cosmetic: align backslashes in makefiles
Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 15:21:45 +00:00