• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7427d1ca
    Michael Niedermayer authored
    * qatar/master:
      g723.1: simplify scale_vector()
      g723.1: simplify normalize_bits()
      vda: cosmetics: fix Doxygen comment formatting
      vda: better frame allocation
      vda: Merge implementation into one file
      vda: support synchronous decoding
      vda: Reuse the bitstream buffer and reallocate it only if needed
      build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
      avprobe: Include libm.h for the log2 fallback
      proresenc: use the edge emulation buffer
      rtmp: handle bytes read reports
      configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
      Use log2(x) instead of log(x) / log(2)
      x86: swscale: fix fragile memory accesses
      x86: swscale: remove disabled code
      x86: yadif: fix asm with suncc
      x86: cabac: allow building with suncc
      x86: mlpdsp: avoid taking address of void
      ARM: intmath: use native-size return types for clipping functions
    
    Conflicts:
    	configure
    	ffprobe.c
    	libavcodec/Makefile
    	libavcodec/g723_1.c
    	libavcodec/v210dec.h
    	libavcodec/vda.h
    	libavcodec/vda_h264.c
    	libavcodec/x86/cabac.h
    	libavfilter/x86/yadif_template.c
    	libswscale/x86/rgb2rgb_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7427d1ca
Name
Last commit
Last update
..
arm Loading commit data...
avr32 Loading commit data...
bfin Loading commit data...
mips Loading commit data...
ppc Loading commit data...
sh4 Loading commit data...
tomi Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
adler32.c Loading commit data...
adler32.h Loading commit data...
aes.c Loading commit data...
aes.h Loading commit data...
attributes.h Loading commit data...
audio_fifo.c Loading commit data...
audio_fifo.h Loading commit data...
audioconvert.c Loading commit data...
audioconvert.h Loading commit data...
avassert.h Loading commit data...
avstring.c Loading commit data...
avstring.h Loading commit data...
avutil.h Loading commit data...
base64.c Loading commit data...
base64.h Loading commit data...
blowfish.c Loading commit data...
blowfish.h Loading commit data...
bprint.c Loading commit data...
bprint.h Loading commit data...
bswap.h Loading commit data...
colorspace.h Loading commit data...
common.h Loading commit data...
cpu.c Loading commit data...
cpu.h Loading commit data...
crc.c Loading commit data...
crc.h Loading commit data...
crc_data.h Loading commit data...
des.c Loading commit data...
des.h Loading commit data...
dict.c Loading commit data...
dict.h Loading commit data...
error.c Loading commit data...
error.h Loading commit data...
eval.c Loading commit data...
eval.h Loading commit data...
fifo.c Loading commit data...
fifo.h Loading commit data...
file.c Loading commit data...
file.h Loading commit data...
float_dsp.c Loading commit data...
float_dsp.h Loading commit data...
imgutils.c Loading commit data...
imgutils.h Loading commit data...
integer.c Loading commit data...
integer.h Loading commit data...
internal.h Loading commit data...
intfloat.h Loading commit data...
intfloat_readwrite.c Loading commit data...
intfloat_readwrite.h Loading commit data...
intmath.h Loading commit data...
intreadwrite.h Loading commit data...
inverse.c Loading commit data...
lfg.c Loading commit data...
lfg.h Loading commit data...
libavutil.v Loading commit data...
libm.h Loading commit data...
lls.c Loading commit data...
lls.h Loading commit data...
log.c Loading commit data...
log.h Loading commit data...
lzo.c Loading commit data...
lzo.h Loading commit data...
mathematics.c Loading commit data...
mathematics.h Loading commit data...
md5.c Loading commit data...
md5.h Loading commit data...
mem.c Loading commit data...
mem.h Loading commit data...
opt.c Loading commit data...
opt.h Loading commit data...
parseutils.c Loading commit data...
parseutils.h Loading commit data...
pca.c Loading commit data...
pca.h Loading commit data...
pixdesc.c Loading commit data...
pixdesc.h Loading commit data...
pixfmt.h Loading commit data...
qsort.h Loading commit data...
random_seed.c Loading commit data...
random_seed.h Loading commit data...
rational.c Loading commit data...
rational.h Loading commit data...
rc4.c Loading commit data...
rc4.h Loading commit data...
samplefmt.c Loading commit data...
samplefmt.h Loading commit data...
sha.c Loading commit data...
sha.h Loading commit data...
softfloat.c Loading commit data...
softfloat.h Loading commit data...
time.c Loading commit data...
time.h Loading commit data...
timecode.c Loading commit data...
timecode.h Loading commit data...
timer.h Loading commit data...
timestamp.h Loading commit data...
tree.c Loading commit data...
tree.h Loading commit data...
utils.c Loading commit data...
version.h Loading commit data...
x86_cpu.h Loading commit data...
xtea.c Loading commit data...
xtea.h Loading commit data...