virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
1e90450fad
FFmpeg/libavutil
History
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
adler32.c Merge remote-tracking branch 'qatar/master' 2011-12-09 00:05:51 +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 lavu: add 2.1 channel layout. 2012-01-16 17:38:23 +01:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
avassert.h
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 sws/pixfmt/pixdesc: add support for yuva444p 2012-01-28 01:30:41 +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 Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
cpu.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
crc_data.h
crc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
crc.h
des.c Add coverage exclusions for test code. 2011-12-05 20:05:44 +01: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' 2011-11-23 04:02:17 +01:00
error.c Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
error.h Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
eval.c lavu/eval: add if() and ifnot() eval functions 2012-01-17 12:03:30 +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 av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
imgutils.c Make systematic palette opaque. 2011-12-23 11:43:29 +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' 2011-10-12 05:40:57 +02: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 Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
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_log_format_line. 2011-12-08 18:47:47 +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 libavutil: Remove pointless file test program. 2012-01-26 22:44:37 +01:00
mathematics.c
mathematics.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
md5.c
md5.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
mem.c 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
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' 2011-11-17 02:44:33 +01:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
pca.c
pca.h
pixdesc.c sws/pixfmt/pixdesc: add support for yuva444p 2012-01-28 01:30:41 +01:00
pixdesc.h Merge remote-tracking branch 'qatar/master' 2011-11-25 04:34:44 +01:00
pixfmt.h sws/pixfmt/pixdesc: add support for yuva444p 2012-01-28 01:30:41 +01:00
random_seed.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +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
sha.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
softfloat.c
softfloat.h
timer.h Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +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