• Michael Niedermayer's avatar
    Merge remote-tracking branch 'newdev/master' · 4fa0e247
    Michael Niedermayer authored
    * newdev/master: (33 commits)
      Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
      Add kbdwin.o to AC3 decoder
      Detect byte-swapped AC-3 and support decoding it directly.
      cosmetics: indentation
      Always copy input data for AC3 decoder.
      ac3enc: make sym_quant() branch-free
      cosmetics: indentation
      Add a CPU flag for the Atom processor.
      id3v2: skip broken tags with invalid size
      id3v2: don't explicitly skip padding
      Make sure kbhit() is in conio.h
      fate: update wmv8-drm reference
      vc1: make P-frame deblock filter bit-exact.
      configure: Add the -D parameter to the dlltool command
      amr: Set the AVFMT_GENERIC_INDEX flag
      amr: Set the pkt->pos field properly to the start of the packet
      amr: Set the codec->bit_rate field based on the last packet
      rtsp: Specify unicast for TCP interleaved streams, too
      Set the correct target for mingw64 dlltool
      applehttp: Change the variable for stream position in seconds into int64_t
      ...
    
    Conflicts:
    	ffmpeg.c
    	ffplay.c
    	libavcodec/ac3dec.c
    	libavformat/avio.h
    	libavformat/id3v2.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4fa0e247
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...
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...
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...
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...
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_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...
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...
sha1.h Loading commit data...
softfloat.c Loading commit data...
softfloat.h Loading commit data...
timer.h Loading commit data...
tree.c Loading commit data...
tree.h Loading commit data...
utils.c Loading commit data...
x86_cpu.h Loading commit data...