RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavutil
History
Michael Niedermayer 6bfb3042b3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: use default alignment for audio buffer
  avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
  avutil: use align == 0 for default alignment in audio sample buffer functions
  avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
  avconv: remove OutputStream.picref.
  avconv: only set SAR once on the decoded frame.
  avcodec: validate the channel layout vs. channel count for decoders
  audioconvert: make av_get_channel_layout accept composite names.
  avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-04-09 23:02:33 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
avr32
…
bfin
…
mips
…
ppc
…
sh4
…
tomi
…
x86 Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
adler32.c adler32: add comment for the SIMD code 2012-02-04 20:27:02 +01:00
adler32.h
…
aes.c
…
aes.h
…
attributes.h
…
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-04-09 23:02:33 +02:00
base64.c
…
base64.h
…
bprint.c lavu: add av_bprintf and related. 2012-03-21 13:39:28 +01:00
bprint.h lavu: add av_bprintf and related. 2012-03-21 13:39:28 +01:00
bswap.h
…
colorspace.h
…
common.h lavu: document av_reverse. 2012-02-22 15:35:44 +01:00
cpu.c Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
cpu.h Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
crc.c
…
crc.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
crc_data.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 Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
error.h Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
eval.c The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
eval.h
…
fifo.c
…
fifo.h
…
file.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
file.h
…
imgutils.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
imgutils.h
…
integer.c
…
integer.h
…
internal.h
…
intfloat.h
…
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
intfloat_readwrite.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
…
log.h lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect 2012-02-06 11:30:54 +01:00
lzo.c libavutil: Remove broken and pointless lzo test program. 2012-03-26 13:00:09 +02:00
lzo.h
…
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 Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
mem.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
mem.h
…
opt.c
…
opt.h
…
parseutils.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
parseutils.h lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect 2012-02-06 11:30:54 +01:00
pca.c
…
pca.h
…
pixdesc.c Mark GRAY8 format as pseudo-paletted. 2012-04-09 17:21:35 +02:00
pixdesc.h pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
pixfmt.h sws/pixfmt/pixdesc: add support for yuva444p 2012-01-28 01:30:41 +01: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-04-09 23:02:33 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +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 lavu/timecode: use @see for URL in doxygen. 2012-02-03 00:56:27 +01:00
timecode.h lavu: add public timecode API. 2012-02-02 14:30:28 +01:00
timer.h
…
timestamp.h lavu: add timestamp.h header with convenience timestamp utilities 2012-02-09 18:37:58 +01:00
tree.c
…
tree.h
…
utils.c
…
x86_cpu.h
…