virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
d7804de351
FFmpeg/libavutil
History
Michael Niedermayer 305e4b35ea Merge remote-tracking branch 'qatar/master' 
* qatar/master: (34 commits)
  mlp_parser: fix the channel mask value used for the top surround channel
  vorbisenc: check all allocations for failure
  roqaudioenc: return AVERROR codes instead of -1
  roqaudioenc: set correct bit rate
  roqaudioenc: use AVCodecContext.frame_size correctly.
  roqaudioenc: remove unneeded sample_fmt check
  ra144enc: use int16_t* for input samples rather than void*
  ra144enc: set AVCodecContext.coded_frame
  ra144enc: remove unneeded sample_fmt check
  nellymoserenc: set AVCodecContext.coded_frame
  nellymoserenc: improve error checking in encode_init()
  nellymoserenc: return AVERROR codes instead of -1
  libvorbis: improve error checking in oggvorbis_encode_init()
  mpegaudioenc: return AVERROR codes instead of -1
  libfaac: improve error checking and handling in Faac_encode_init()
  avutil: add AVERROR_UNKNOWN
  check for coded_frame allocation failure in several audio encoders
  audio encoders: do not set coded_frame->key_frame.
  g722enc: check for trellis data allocation error
  libspeexenc: export encoder delay through AVCodecContext.delay
  ...

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/fraps.c
	libavcodec/kgv1dec.c
	libavcodec/libfaac.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/mlp_parser.c
	libavcodec/roqaudioenc.c
	libavcodec/vorbisenc.c
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-26 05:11:21 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Detect and check for CMOV. 2012-02-12 18:56:06 +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
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
avassert.h
avstring.c
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-02-26 05:11:21 +01: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
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
colorspace.h
common.h lavu: document av_reverse. 2012-02-22 15:35:44 +01:00
cpu.c
cpu.h Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
crc_data.h
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 Add coverage exclusions for test code. 2011-12-05 20:05:44 +01:00
des.h
dict.c
dict.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +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 eval: support 3 parameter functions. 2012-02-22 23:09:47 +01: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
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-02-09 01:27:12 +01:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
integer.c
integer.h
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
inverse.c
lfg.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
lfg.h
libavutil.v
libm.h
lls.c
lls.h
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 Avoid av_memcpy_backptr hang without extra branch. 2011-12-30 10:37:33 +01:00
lzo.h Avoid uninitialized data in lcldec when ofs is 0 in MSZH. 2011-12-31 16:31:15 +01:00
Makefile random_seed: add selftest 2012-02-23 23:44:38 +01: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 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 lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect 2012-02-06 11:30:54 +01: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 Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
pixdesc.h Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +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 Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
rational.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rc4.c
rc4.h
samplefmt.c libavutil: increase struct SampleFmtInfo member 'name' length to 8 2011-12-03 00:35:20 +01:00
samplefmt.h lavu: add av_get_alt_sample_fmt(). 2011-11-24 16:55:45 +01: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
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 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