RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-01 20:32:59 +00:00
Code Issues Projects Releases Wiki Activity
703e920bb7
ffmpeg/libavutil
History
Michael Niedermayer 1cbf7fb434 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (26 commits)
  fate: use diff -b in oneline comparison
  Add missing version bumps and APIchanges/Changelog entries.
  lavfi: move buffer management function to a separate file.
  lavfi: move formats-related functions from default.c to formats.c
  lavfi: move video-related functions to a separate file.
  fate: make smjpeg a demux test
  fate: separate sierra-vmd audio and video tests
  fate: separate smacker audio and video tests
  libmp3lame: set supported channel layouts.
  avconv: automatically insert asyncts when -async is used.
  avconv: add support for audio filters.
  lavfi: add asyncts filter.
  lavfi: add aformat filter
  lavfi: add an audio buffer sink.
  lavfi: add an audio buffer source.
  buffersrc: add av_buffersrc_write_frame().
  buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
  lavfi: rename vsrc_buffer.c to buffersrc.c
  avfiltergraph: reindent
  lavfi: add channel layout/sample rate negotiation.
  ...

Conflicts:
	Changelog
	doc/APIchanges
	doc/filters.texi
	ffmpeg.c
	ffprobe.c
	libavcodec/libmp3lame.c
	libavfilter/Makefile
	libavfilter/af_aformat.c
	libavfilter/allfilters.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
	libavfilter/defaults.c
	libavfilter/formats.c
	libavfilter/src_buffer.c
	libavfilter/version.h
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c
	libavfilter/vsrc_buffer.h
	libavutil/avutil.h
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16 02:27:31 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
avr32
bfin
mips Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audio_fifo.h avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
avassert.h
avstring.c
avstring.h
avutil.h Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
base64.c
base64.h
bprint.c lavu/bprint: add av_bprint_reset(). 2012-05-14 19:11:39 +02:00
bprint.h lavu/bprint: add av_bprint_reset(). 2012-05-14 19:11:39 +02:00
bswap.h
colorspace.h
common.h lavu: document av_reverse. 2012-02-22 15:35:44 +01:00
cpu.c cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps() 2012-04-30 18:31:06 +02:00
cpu.h libavutil: Document the shortcommings of av_parse_cpu_flags() 2012-04-30 18:31:06 +02:00
crc_data.h
crc.c
crc.h
des.c des: Fix half a dozen warnings 2012-04-02 21:23:56 +02:00
des.h
dict.c
dict.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
error.c error: Try to make av_strerror() closer to binary identical across platforms. 2012-05-09 11:26:11 +02:00
error.h error: ensure error codes are signed negative ints. 2012-04-15 17:58:33 +02:00
eval.c The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
eval.h
fifo.c fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
fifo.h fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
file.c
file.h
imgutils.c av_image_alloc: Align the width to 8 when align >= 8. 2012-04-13 18:40:17 +02:00
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.h
intreadwrite.h
inverse.c
lfg.c Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c avutil/log: allow av_log_set_callback (NULL) 2012-05-10 19:11:23 +02:00
log.h
lzo.c libavutil: Remove broken and pointless lzo test program. 2012-03-26 13:00:09 +02:00
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
mathematics.c Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
mathematics.h Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
md5.c
md5.h
mem.c mem.c: fix wrong comment. 2012-04-16 22:13:12 +02:00
mem.h
opt.c lavu/opt: clarify error message in set_key_value_pair() 2012-04-30 23:04:46 +02:00
opt.h AVoption doxy: clarify a few needs in relation to AVClass less structs. 2012-04-18 15:30:34 +02:00
parseutils.c parseutils: use strings instead of integers for error codes. 2012-05-09 02:53:42 +02:00
parseutils.h
pca.c
pca.h
pixdesc.c Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
pixdesc.h pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
pixfmt.h Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
random_seed.c random_seed: add selftest 2012-02-23 23:44:38 +01:00
random_seed.h
rational.c libavutil: Remove pointless rational test program. 2012-03-26 13:00:09 +02:00
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
sha.c Merge remote-tracking branch 'qatar/master' 2012-02-14 01:53:31 +01:00
sha.h
softfloat.c
softfloat.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utils.c
x86_cpu.h