mirror of https://git.ffmpeg.org/ffmpeg.git
* 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> |
||
---|---|---|
.. | ||
arm | ||
avr32 | ||
bfin | ||
mips | ||
ppc | ||
sh4 | ||
tomi | ||
x86 | ||
Makefile | ||
adler32.c | ||
adler32.h | ||
aes.c | ||
aes.h | ||
attributes.h | ||
audioconvert.c | ||
audioconvert.h | ||
avassert.h | ||
avstring.c | ||
avstring.h | ||
avutil.h | ||
base64.c | ||
base64.h | ||
bswap.h | ||
colorspace.h | ||
common.h | ||
cpu.c | ||
cpu.h | ||
crc.c | ||
crc.h | ||
crc_data.h | ||
des.c | ||
des.h | ||
dict.c | ||
dict.h | ||
error.c | ||
error.h | ||
eval.c | ||
eval.h | ||
fifo.c | ||
fifo.h | ||
file.c | ||
file.h | ||
imgutils.c | ||
imgutils.h | ||
integer.c | ||
integer.h | ||
internal.h | ||
intfloat.h | ||
intfloat_readwrite.c | ||
intfloat_readwrite.h | ||
intmath.h | ||
intreadwrite.h | ||
inverse.c | ||
lfg.c | ||
lfg.h | ||
libavutil.v | ||
libm.h | ||
lls.c | ||
lls.h | ||
log.c | ||
log.h | ||
lzo.c | ||
lzo.h | ||
mathematics.c | ||
mathematics.h | ||
md5.c | ||
md5.h | ||
mem.c | ||
mem.h | ||
opt.c | ||
opt.h | ||
parseutils.c | ||
parseutils.h | ||
pca.c | ||
pca.h | ||
pixdesc.c | ||
pixdesc.h | ||
pixfmt.h | ||
random_seed.c | ||
random_seed.h | ||
rational.c | ||
rational.h | ||
rc4.c | ||
rc4.h | ||
samplefmt.c | ||
samplefmt.h | ||
sha.c | ||
sha.h | ||
softfloat.c | ||
softfloat.h | ||
timer.h | ||
tree.c | ||
tree.h | ||
utils.c | ||
x86_cpu.h |