Commit Graph

46 Commits

Author SHA1 Message Date
Michael Niedermayer
55c49afc42 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  yuv4mpeg: return proper error codes.
  Give all anonymously typedeffed structs in headers a name
  fate: Add parseutils test
  parseutils-test: Drop random colors from parsing test
  vf_pad/scale: use double precision for aspect ratios.
  build: error on variable-length arrays
  ppc: swscale: rework yuv2planeX_altivec()
  ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
  x86: dsputil: kill VLA in gmc_mmx()
  libspeexenc: Updated commentary to reflect recent changes
  libspeexenc: Add an option for enabling DTX
  doc/APIchanges: fill in missing dates and hashes.
  lavr: bump major to 1 and declare it stable.
  lavr: change the type of the data buffers to uint8_t**.
  lavc: deprecate the audio resampling API.

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	ffplay.c
	libavcodec/dwt.h
	libavcodec/libspeexenc.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavformat/asf.h
	tests/fate/libavutil.mak
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06 13:45:08 +02:00
Diego Biurrun
e4cbf7529b Give all anonymously typedeffed structs in headers a name
Anonymous structs cannot be forward declared and have no benefit.
2012-10-06 09:27:11 +02:00
Michael Niedermayer
967facb695 Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
  adxenc: use AVCodec.encode2()
  adxenc: Use the AVFrame in ADXContext for coded_frame
  indeo4: fix out-of-bounds function call.
  configure: Restructure help output.
  configure: Internal-only components should not be command-line selectable.
  vorbisenc: use AVCodec.encode2()
  libvorbis: use AVCodec.encode2()
  libopencore-amrnbenc: use AVCodec.encode2()
  ra144enc: use AVCodec.encode2()
  nellymoserenc: use AVCodec.encode2()
  roqaudioenc: use AVCodec.encode2()
  libspeex: use AVCodec.encode2()
  libvo_amrwbenc: use AVCodec.encode2()
  libvo_aacenc: use AVCodec.encode2()
  wmaenc: use AVCodec.encode2()
  mpegaudioenc: use AVCodec.encode2()
  libmp3lame: use AVCodec.encode2()
  libgsmenc: use AVCodec.encode2()
  libfaac: use AVCodec.encode2()
  g726enc: use AVCodec.encode2()
  ...

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/ac3enc.c
	libavcodec/adxenc.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/vorbisenc.c
	libavcodec/wmaenc.c
	tests/ref/acodec/g722
	tests/ref/lavf/asf
	tests/ref/lavf/ffm
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/seek/lavf_asf
	tests/ref/seek/lavf_ffm
	tests/ref/seek/lavf_mkv
	tests/ref/seek/lavf_mpg
	tests/ref/seek/lavf_rm
	tests/ref/seek/lavf_ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 00:40:11 +01:00
Justin Ruggles
330d9d1b50 ra144enc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Michael Niedermayer
2af8f2cea6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
  cmdutils: use new avcodec_is_decoder/encoder() functions.
  lavc: make codec_is_decoder/encoder() public.
  lavc: deprecate AVCodecContext.sub_id.
  libcdio: add a forgotten AVClass to the private context.
  swscale: remove "cpu flags" from -sws_flags description.
  proresenc: give user a possibility to alter some encoding parameters
  vorbisenc: add output buffer overwrite protection
  libopencore-amrnbenc: fix end-of-stream handling
  ra144enc: fix end-of-stream handling
  nellymoserenc: zero any leftover packet bytes
  nellymoserenc: use proper MDCT overlap delay
  qpeg: Use bytestream2 functions to prevent buffer overreads.
  swscale: make %rep unconditional.
  vp8: convert simple loopfilter x86 assembly to use named arguments.
  vp8: convert idct x86 assembly to use named arguments.
  vp8: convert mc x86 assembly to use named arguments.
  vp8: convert loopfilter x86 assembly to use cpuflags().
  vp8: convert idct/mc x86 assembly to use cpuflags().
  swscale: remove now unnecessary hack.
  x86inc: don't "bake" stack_offset in named arguments.
  ...

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/qpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavdevice/libcdio.c
	tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-05 00:15:55 +01:00
Justin Ruggles
b0350c1c30 ra144enc: fix end-of-stream handling
Use CODEC_CAP_DELAY and CODEC_CAP_SMALL_LAST_FRAME to properly pad and flush
the encoder at the end of encoding. This is needed in order to have all input
samples decoded.
2012-03-04 01:14:53 -05:00
Michael Niedermayer
e4de71677f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
	doc/APIchanges
	doc/developer.texi
	libavcodec/8svx.c
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/nellymoserdec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/asfdec.c
	tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03 03:00:30 +01:00
Justin Ruggles
0eea212943 Add avcodec_decode_audio4().
Deprecate avcodec_decode_audio3().
Implement audio support in avcodec_default_get_buffer().
Implement the new audio decoder API in all audio decoders.
2011-12-02 17:40:40 -05: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
Diego Elio Pettenò
be61983d52 Make ff_add_wav static to ra144.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 1a88674862)
2011-01-26 03:43:33 +01:00
Diego Elio Pettenò
1a88674862 Make ff_add_wav static to ra144.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 22:11:54 +01:00
Justin Ruggles
0d8837bdda Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 56f8952b25)
2011-01-23 19:32:06 +01:00
Justin Ruggles
56f8952b25 Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 19:58:59 +00:00
Francesco Lavra
d31ba23185 RealAudio 14.4k encoder.
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 09:01:25 +00:00
Francesco Lavra
756e346798 Split do_output_subblock() into common code and decoder specific parts
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:05:17 +00:00
Francesco Lavra
5ec29beeb4 Cosmetics: indent
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:04:22 +00:00
Francesco Lavra
6ea6c8ebcf Add ff_ prefix to non-static functions
Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:03:43 +00:00
Francesco Lavra
0acaf8b0f2 Split ra144.c in common code (to be shared with the future encoder) and
decoder.

Patch by Francesco Lavra (firstnamelastname@interfree.it)

Originally committed as revision 23573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:01:51 +00:00
Vitor Sessak
c7e34ddc42 Remove useless comment
Originally committed as revision 15274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:52:00 +00:00
Vitor Sessak
20242eed99 Normalize triplets in gain_val_tab[][] so gain_exp_tab[] can be just an
one-dimensional array.

Originally committed as revision 15273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:51:33 +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
Stefan Gehrer
cf2baeb338 mark read-only data as const
Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 20:01:31 +00:00
Vitor Sessak
ae70f874ba Remove unused entries from lpc_refl_cb*
Originally committed as revision 13945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 18:13:44 +00:00
Vitor Sessak
7986199fcf Remove unused entries from energy_tab
Originally committed as revision 13944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 18:06:30 +00:00
Vitor Sessak
cbcc2527ea Remove unused values from gain_{val,exp}_tab
Originally committed as revision 13937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 21:27:42 +00:00
Vitor Sessak
274ac3457e Now these tables fit in 16 bits.
Originally committed as revision 13936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 21:12:35 +00:00
Vitor Sessak
738ef8fd08 Merge the >> 4 calculation of cb1_base in the table
Originally committed as revision 13935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 21:10:59 +00:00
Vitor Sessak
509f8ea270 Last table renaming
Originally committed as revision 13828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 20:43:34 +00:00
Vitor Sessak
b845df113c Yet more table renaming
Originally committed as revision 13827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 20:36:23 +00:00
Vitor Sessak
6e05a76640 10l: fix typo
Originally committed as revision 13826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 20:34:29 +00:00
Vitor Sessak
a632f44e81 More table renaming
Originally committed as revision 13825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 20:31:34 +00:00
Vitor Sessak
a2d10dd8d8 Rename table
Originally committed as revision 13824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 20:28:28 +00:00
Diego Biurrun
b11829a9d9 Add missing #includes to fix 'make checkheaders'.
Originally committed as revision 13776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 08:25:48 +00:00
Vitor Sessak
6477a940f6 Yet more cosmetics
Originally committed as revision 13396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 17:06:14 +00:00
Vitor Sessak
d7dc90e42d Use (u)int16_t instead of short for tables
Originally committed as revision 13376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 13:26:04 +00:00
Vitor Sessak
0a08273542 Make tables that fit in one byte (u)int8_t
Originally committed as revision 13375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 13:25:10 +00:00
Vitor Sessak
d548f09ff6 Make wavtable a table instead of an array
Originally committed as revision 13274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 09:15:01 +00:00
Vitor Sessak
65189c6cac Make etable1 and etable2 tables instead of arrays.
Originally committed as revision 13212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 16:38:44 +00:00
Vitor Sessak
432a54ef80 Use ff_sqrt() function instead of using a table
Originally committed as revision 13210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 16:33:49 +00:00
Vitor Sessak
b8caf9bf28 Convert ra144.h tables from hex to decimal
Originally committed as revision 13190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-17 14:34:55 +00:00
Vitor Sessak
dbef8b1c84 The first table of decodetable[] is unrelated to the other. Rename it.
Originally committed as revision 13159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 18:28:24 +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
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
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Alex Beregszaszi
9085af0751 moved the tables into header files (and applied the 'static' patch). Nick: why do you like mergeing tables and code into one file, so making it unusable big?
Originally committed as revision 1999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-29 19:11:55 +00:00