RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,594 Commits 36 Branches 398 Tags 223 MiB
Commit Graph

24 Commits

Author SHA1 Message Date
Michael Niedermayer f93f6963ba Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv30: return AVERROR(EINVAL) instead of EINVAL
  build: add -L flags before existing LDFLAGS
  simple_idct: whitespace cosmetics
  simple_idct: make repeated code a macro
  dsputil: remove huge #if 0 block
  simple_idct: change 10-bit add/put stride from pixels to bytes
  dsputil: allow 9/10-bit functions for non-h264 codecs
  dnxhd: rename some data tables
  dnxhdenc: remove inline from function only called through pointer
  dnxhdenc: whitespace cosmetics
  swscale: mark YUV422P10(LE,BE) as supported for output
  configure: add -xc99 to LDFLAGS for Sun CC
  Remove unused and non-compiling vestigial g729 decoder
  Remove unused code under G729_BITEXACT #ifdef.
  mpegvideo: fix invalid picture unreferencing.
  dsputil: Remove extra blank line at end.
  dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
  simple_idct: add 10-bit version

Conflicts:
	Makefile
	libavcodec/g729data.h
	libavcodec/g729dec.c
	libavcodec/rv30.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-21 16:28:53 +02:00
Diego Biurrun 79a9aab56f Remove unused and non-compiling vestigial g729 decoder 2011-07-20 20:47:07 +02:00
Michael Niedermayer cbfdfbe846 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6
  ARM: NEON optimised vector_clip_int32()
  swscale: disable full_chroma_int when converting to non-24/32bpp RGB.
  suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy
  ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()
  put_bits: remove ALT_BITSTREAM_WRITER
  put_bits: always use intreadwrite.h macros
  libavformat: Add an example how to use the metadata API
  doxygen: Prefer member groups over grouping into modules
  doxygen: be more permissive when searching for API examples
  avformat: doxify the Metadata API
  lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.
  lavf: use the correct pointer in av_open_input_stream().
  avidec: infer absolute vs relative index from first packet

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-03 03:14:10 +02:00
Reinhard Tartler 21a19b7912 doxygen: Prefer member groups over grouping into modules 
Before this, almost all module groups have been used for grouping functions
and fields in structures semantically. This causes them to not appear
properly in the file documentation and needlessly clutters up the "Modules"
index.

Additionally, this commit streamlines some spelling and appearances.
 2011-07-02 13:52:29 +02:00
Michael Niedermayer dbe5f0172b amrnbdec: we dont want dtx samples anymore and give the user a hint towards how to play such files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-28 23:12:56 +02:00
Michael Niedermayer 8b7dc087e4 Add forgotten const to enum AVSampleFormat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-12 14:26:18 +02:00
Martin Storsjö c41eb2ade4 libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-12 12:38:37 +03: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
Mans Rullgard 46382ae2ec amrnb: use correct size when copying lsf_r array 
lsf_r is an array of int16_t, not float.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1efa772e20)
 2011-02-22 02:38:41 +01:00
Mans Rullgard 1efa772e20 amrnb: use correct size when copying lsf_r array 
lsf_r is an array of int16_t, not float.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-20 17:31:48 +00:00
Diego Elio Pettenò e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Stefano Sabatini 5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Marcelo Galvăo Póvoa c7bb7eff81 Move AMR-NB frame unpacking code to a common file so it can be reused in 
the AMR-WB decoder.

Patch by Marcelo Galvăo Póvoa.

Originally committed as revision 25100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 19:51:08 +00:00
Marcelo Galvăo Póvoa 1d96cc0865 Move AMRNB lsf2lsp() function to common code for using in future AMRWB decoder. 
Patch by Marcelo Galvăo Póvoa

Originally committed as revision 25061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 20:44:41 +00:00
Martin Storsjö fa36165adf amrnbdec: Apply AMR_SAMPLE_SCALE when finishing the decoder output 
The output scaling was accidentally removed in rev 22937.

Originally committed as revision 23012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 05:57:48 +00:00
Ronald S. Bultje b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder 
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:57:48 +00:00
Ronald S. Bultje 8955a9d79c Split input/output data arguments to ff_acelp_apply_order_2_transfer_function(). 
Originally committed as revision 22933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:45:24 +00:00
Ronald S. Bultje bb2dd9efd8 Split the input/output data arguments to ff_adaptive_gain_control(). 
Originally committed as revision 22932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:43:52 +00:00
Vitor Sessak a2d3588813 10l: do not try to unpack DTX frames in AMR-NB decoder 
Originally committed as revision 22930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 13:05:25 +00: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 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Ronald S. Bultje 95c6b5ebc8 Fix spelling. 
Originally committed as revision 22470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 17:42:53 +00:00
Vitor Sessak 4fe3edaadf AMR-NB floating-point based decoder. 
Code produced during SoC by Robert Swain and Colin McQuillan.

Originally committed as revision 21943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 18:01:56 +00:00