mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 00:32:31 +00:00
aedc908601
* qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
arm | ||
avr32 | ||
bfin | ||
mips | ||
ppc | ||
sh4 | ||
tomi | ||
x86 | ||
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_data.h | ||
crc.c | ||
crc.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_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 | ||
Makefile | ||
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 |