Commit Graph

13 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
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
Reimar Döffinger
6785e92709 mathematics.h no longer needs config.h, so update tablegen code and
documentation to use it where appropriate.

Originally committed as revision 23680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 17:01:22 +00:00
Michael Niedermayer
b91d46614d float based mp1/mp2/mp3 decoders.
Originally committed as revision 23095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 19:52:42 +00:00
Måns Rullgård
4f898e77fb Revert "Add required header #include to fix 'make checkheaders'."
config.h must not be included in that file.  The table generator runs
on the host system, but config.h describes the target.

Originally committed as revision 20620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 10:06:41 +00:00
Diego Biurrun
e137934fae cosmetics: K&R style, prettyprinting
Originally committed as revision 20619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 09:59:10 +00:00
Diego Biurrun
154f5b5c9b Add required header #include to fix 'make checkheaders'.
Originally committed as revision 20612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 23:24:09 +00:00
Michael Niedermayer
a16f80f392 Remove unused variable.
1l for me if it wherent sunday and i could buy cola.

Originally committed as revision 20477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 14:54:43 +00:00
Michael Niedermayer
f3001e0dee Simpliy exp*table init, based on patch by reimar.
Originally committed as revision 20470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-07 20:10:02 +00:00
Reimar Döffinger
52a4a07778 Fix out-of-tree builds with --enable-hardcoded-tables
Originally committed as revision 20404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-28 19:38:31 +00:00
Reimar Döffinger
8abe97be92 10l, fix incorrect endif comment.
Originally committed as revision 20401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-28 18:52:39 +00:00
Reimar Döffinger
eadaa00c6f Add support for hardcoding the mpegaudiodec tables.
Reduces .bss size by about 194 kB.

Originally committed as revision 20400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-28 18:42:52 +00:00