virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
7f1ae79d38
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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mips Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tomi Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'qatar/master' 2012-03-16 01:36:49 +01:00
adler32.c adler32: add comment for the SIMD code 2012-02-04 20:27:02 +01:00
adler32.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-12-22 01:51:53 +01:00
aes.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
attributes.h avutil: add av_noreturn 2011-11-11 04:24:00 +01: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 Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
avutil.h Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
base64.c base64: 10l endian fix. 2012-01-22 23:06:04 +01:00
base64.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
colorspace.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
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_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
crc.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
des.c des: Fix half a dozen warnings 2012-04-02 21:23:56 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
fifo.c fifo: Make writes atomic. 2011-12-23 00:18:36 +01:00
fifo.h fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
file.h av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
integer.c avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
integer.h avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
intfloat_readwrite.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
intfloat.h lavu: replace int/float punning functions 2011-12-11 18:47:19 +00:00
intmath.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
lfg.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
libavutil.v
libm.h Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c log: use a different color for debug (green). 2012-01-09 22:35:45 +01:00
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 Avoid uninitialized data in lcldec when ofs is 0 in MSZH. 2011-12-31 16:31:15 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +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 Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
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 mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece 2011-12-25 18:55:43 +01:00
opt.c opt: Fix "libavutil/opt.c:811:20: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]" 2012-01-20 20:34:48 +01:00
opt.h Fix compilation for C++ applications 2011-12-05 21:13:45 +01:00
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 Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pca.h Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rational.c libavutil: Remove pointless rational test program. 2012-03-26 13:00:09 +02:00
rational.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rc4.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
timestamp.h lavu: add timestamp.h header with convenience timestamp utilities 2012-02-09 18:37:58 +01:00
tree.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
tree.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
utils.c libavutil: increase LIBAVUTIL_VERSION_MICRO to 100 2011-12-22 03:01:17 +01:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00