1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

33 Commits

Author SHA1 Message Date
Paul B Mahol
dea9da5f16 qcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-19 01:24:56 +00:00
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
b404ab9e74 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mov: Don't av_malloc(0).
  avconv: only allocate 1 AVFrame per input stream
  avconv: fix memleaks due to not freeing the AVFrame for audio
  h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
  misc Doxygen markup improvements
  doxygen: eliminate Qt-style doxygen syntax
  g722: Add a regression test for muxing/demuxing in wav
  g722: Change bits per sample to 4
  g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
  api-example: update to use avcodec_decode_audio4()
  avplay: use avcodec_decode_audio4()
  avplay: use a separate buffer for playing silence
  avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
  avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
  mov: Allow empty stts atom.
  doc: document preferred Doxygen syntax and make patcheck detect it

Conflicts:
	avconv.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/version.h
	libavformat/mov.c
	tests/codec-regression.sh
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-06 01:37:27 +01:00
Diego Biurrun
c68fafe0d2 doxygen: eliminate Qt-style doxygen syntax 2011-12-05 13:06:58 +01: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
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +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
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
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
Diego Biurrun
e19f995263 Fix bandwith vs. bandwiDth typo.
Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-12 23:40:22 +00:00
Reynaldo H. Verdejo Pinochet
87574416f7 Part 2 of 2 of Kenan Gillet's 'make ff_qcelp_lspf2lpc
more general' changeset. This one relocates the QCELP
especific code to the qcelpdec.* files.

Originally committed as revision 17800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 01:33:56 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Reynaldo H. Verdejo Pinochet
9e00c20e00 COSMETICS, add missing remarks crediting Ben and Kenan
Originally committed as revision 16003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 14:54:55 +00:00
Vitor Sessak
b8438f5f48 Remove hack added to make "make checkheaders" pass, it is unneeded now
Originally committed as revision 15974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 20:45:29 +00:00
Kenan Gillet
f28b3eb21c More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 20:43:22 +00:00
Kenan Gillet
640760da3e More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 17:18:17 +00:00
Diego Biurrun
ab56b321a9 Disable unused code for now to allow 'make checkheaders' to pass.
Originally committed as revision 15933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-24 21:31:01 +00:00
Diego Biurrun
4b5f19074e Add missing headers to get 'make checkheaders' closer to passing.
Originally committed as revision 15932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-24 21:29:07 +00:00
Kenan Gillet
148c31b9c2 More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 18:39:16 +00:00
Vitor Sessak
31fb59ec98 Cosmetic: Fix typo
Spotted by Jethro Walters

Originally committed as revision 15900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 17:38:14 +00:00
Kenan Gillet
469105aadb Fix typo in table value.
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 19:04:35 +00:00
Reynaldo H. Verdejo Pinochet
8e36385a63 Credit Kenan Gillet for his contributions towards merging the SoC QCELP decoder.
Originally committed as revision 15839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 01:00:25 +00:00
Reynaldo H. Verdejo Pinochet
f29289eec7 Change to file description suggested by Michael
Originally committed as revision 15837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 00:05:20 +00:00
Reynaldo H. Verdejo Pinochet
8257d2ad51 Please keep original copyright heading and attribution lines...
Originally committed as revision 15831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:19:20 +00:00
Kenan Gillet
39ded68013 More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 17:36:47 +00:00
Kenan Gillet
200de8c6bb More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-11 18:50:38 +00:00
Kenan Gillet
2ae1a9b264 More OKed parts of the QCELP decoder
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-09 12:00:47 +00:00
Diego Biurrun
88df35d3e8 cosmetics: small spelling fixes
Originally committed as revision 15755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30 22:11:30 +00:00
Kenan Gillet
8c31f18bf9 More OKed parts of QCELP data tables
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30 21:00:01 +00:00
Kenan Gillet
ba26cfab47 OKed parts of QCELP data tables
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-29 06:26:56 +00:00