Commit Graph

46 Commits

Author SHA1 Message Date
Michael Niedermayer
b97b4b58a6 Merge remote branch 'qatar/master'
* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 04:03:17 +02:00
Mans Rullgard
6bb6fb05ba mpegaudio: remove CONFIG_MPEGAUDIO_HP option
The low quality mode is off by default and never tested.  The high
quality mode is also plenty fast enough.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 17:30:12 +01:00
Oskar Arvidsson
8dbe585641 Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
This patch lets e.g. dsputil_init chose dsp functions with respect to
the bit depth to decode. The naming scheme of bit depth dependent
functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
clear_blocks_c is now named clear_blocks_8_c).

Note: Some of the functions for high bit depth is not dependent on the
bit depth, but only on the pixel size. This leaves some room for
optimizing binary size.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-10 22:33:42 +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
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 15:50:14 +01:00
Diego Biurrun
5298b070c2 Remove misplaced Doxygen comment.
Originally committed as revision 23969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:37:13 +00:00
Måns Rullgård
8fbd4f51a8 Improve some uses of ff_cropTbl with constant offset
Originally committed as revision 23728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 23:12:48 +00:00
Måns Rullgård
3bd74e9243 Simplify arch-specific object file lists
Originally committed as revision 22570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-16 21:23:03 +00:00
Måns Rullgård
43f60eba19 Move arch-specific makefile parts into $arch/Makefile
Originally committed as revision 22569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-16 21:22:59 +00:00
Måns Rullgård
dd14a04e4a Add missing includes in bfin and sh4 files
Originally committed as revision 22342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:17:51 +00:00
Måns Rullgård
ac36d974d6 bfin: fix function prototypes
Move prototypes to header files, add missing prototypes,
make some functions static.

Originally committed as revision 22310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 02:36:11 +00:00
Måns Rullgård
d132d50fb8 Blackfin: use SRAM only when CONFIG_SRAM is set
Originally committed as revision 21565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 00:20:30 +00:00
Diego Biurrun
deb1b2b699 Add necessary #include for config.h.
Originally committed as revision 19692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-24 10:59:14 +00:00
Måns Rullgård
3aab27b459 Remove useless #include <unistd.h> from many files
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-22 23:37:53 +00:00
Måns Rullgård
b716a79215 blackfin: disable broken dsputil functions
Originally committed as revision 18977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:36:06 +00:00
Måns Rullgård
2ba73ce8c6 blackfin: add missing const in function prototypes
Originally committed as revision 18976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:36:02 +00:00
Måns Rullgård
b195a73d47 blackfin: use optimised (I)DCT only when ctx->(i)dct_algo is auto
Originally committed as revision 18975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:35:58 +00:00
Måns Rullgård
08ec1397f6 blackfin: use DCT function pointer in dct_quantize_bfin()
Originally committed as revision 18974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:35:56 +00:00
Diego Biurrun
b17e0f065c Remove file name from file headers.
It provides no useful information and breaks on renames.

Originally committed as revision 17097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 11:17:54 +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
9686df2be5 Delete unnecessary 'extern' keywords.
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 15:23:30 +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
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +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
Mike Frysinger
e44d7c659b FLAT objects cannot have multiple sections, so using the L1 attributes breaks
linking. The FDPIC relocs also break for any other format. Thus check the
compiler environment and select the appropriate sections/relocs.
patch by Mike Frysinger, vapier.adi a gmail d com

Originally committed as revision 12125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-16 15:17:31 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
Diego Biurrun
31b2c1446f Add missing multiple inclusion guards.
Originally committed as revision 10763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:31:06 +00:00
Diego Biurrun
98753e9c9c license header consistency cosmetics.
Originally committed as revision 10668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-04 22:41:21 +00:00
Marc Hoffman
b9dc32799b blackfin optimized vp3 transform and infastructure for idct
Originally committed as revision 10667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-04 20:47:12 +00:00
Marc Hoffman
584a3ac907 blackfin vsad primitives
Originally committed as revision 10521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-17 13:23:16 +00:00
Marc Hoffman
56261c6150 properly tell the compiler that A0 and A1 are clobbered
Originally committed as revision 10520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-17 13:17:50 +00:00
Diego Biurrun
d8dfda7e51 Use a consistent multiple inclusion guard.
Originally committed as revision 10267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-30 22:41:54 +00:00
Marc Hoffman
543a90d14a Blackfin 32bit multiplication primitives MULH MUL16
Originally committed as revision 10262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-30 15:15:48 +00:00
Marc Hoffman
345bb2ad90 special handling for vp3 idct, use the c reference
Originally committed as revision 10105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-13 14:16:20 +00:00
Marc Hoffman
aa6bfe8324 removing dependency on bfin_sram.h, which is not used right now
Originally committed as revision 9388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-22 13:44:58 +00:00
Marc Hoffman
bd92f4f39b renaming L1CODE to attribute_l1_text, which is defined in dsputil_bfin.h
Originally committed as revision 9387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-22 13:43:47 +00:00
Marc Hoffman
57870214ab removing underscores from block profiling renaming to xx_
Originally committed as revision 9303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-13 12:46:27 +00:00
Marc Hoffman
50ee61dda2 Blackfin dct_quantize_bfin routine
2x performance boost in performing quantization for mpeg encoding

Originally committed as revision 9293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 19:13:50 +00:00
Marc Hoffman
ea6ad30ce9 Blackfin IDCT has no special permutation it uses normal order
Originally committed as revision 9292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 19:06:39 +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
Marc Hoffman
27885fad3e Blackfin DSP utilities: add DEFUN_END
DEFUN_END macro adds the size information to the symbol
table. This is introduces no functionnal change, it's only meant to simplify
e.g. debugging
Patch by Marc Hoffman %mmh A pleasantst P com%
Original thread:
Date: May 5, 2007 12:26 PM
Subject: [FFmpeg-devel] PATCH Blackfin DSP utilities, DEFUN_END added

Originally committed as revision 9019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-13 20:19:22 +00:00
Diego Biurrun
987c3aa810 Remove #if 0 code.
Originally committed as revision 8605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 11:26:14 +00:00
Marc Hoffman
67fd620c01 bfin dsputils, basic pixel operations sads, diffs, motion compensation
and standard IEEE 8x8 block transforms
patch by Marc Hoffman, mmh pleasantst com

Originally committed as revision 8594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 22:28: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
Michael Benjamin
5ca030fed4 ADI Blackfin optimizations
patch by Michael Benjamin, neuroptik gmail com

Originally committed as revision 6282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-16 22:26:09 +00:00