1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

11 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
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ò
d20d1449e0 Make ff_interleave_compare_dts static to utils.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 101e1f6ff9)
2011-01-26 03:43:31 +01:00
Diego Elio Pettenò
101e1f6ff9 Make ff_interleave_compare_dts static to utils.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Michael Niedermayer
41dd680dd8 Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
Yes this breaks ABI/API but ive already broken it and will bump avutil major
soon.

Originally committed as revision 17869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:16:55 +00:00
Baptiste Coudurier
16e3b0b3e6 rename ff_audio_interleave to ff_audio_rechunk_interleave
Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 21:34:20 +00:00
Diego Biurrun
fbd7ddf459 cosmetics: typo/grammar fixes in doxygen and other comments
Originally committed as revision 17085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 23:34:58 +00:00
Baptiste Coudurier
18099ade6f Declare ff_interleave_new_audio_packet as static, it is not used
outside of audiointerleave.c.  Also remove the function declaration
  from the header as it is now static.

Originally committed as revision 17068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:09:50 +00:00
Baptiste Coudurier
94027d3bdd document ff_audio_interleave
Originally committed as revision 17066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:08:34 +00:00
Baptiste Coudurier
f1544e79f2 extract audio interleaving code from mxf muxer, will be used by gxf and dv
Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:31:44 +00:00