• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3e1a7ae4
    Michael Niedermayer authored
    * qatar/master:
      swfdec: Add support for sample_rate_code 0 (5512 Hz)
      dct-test: factor out some common code and do whas was likely intended
      doc: library versions need to be bumped in version.h
      Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
      Remove some forgotten AVCodecContext.palctrl usage.
      lavc/utils: move avcodec_init() higher in the file.
      lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
      ac3dec: actually use drc_scale private option
      lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
      alsa: add missing header
      msmpeg4: remove leftover unused debug variable declaration
      Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
      Fix av_dlog invocations with wrong or missing logging context.
      vf_yadif: add support to yuva420p
      vf_yadif: correct documentation on the parity parameter
      vf_yadif: copy buffer properties like aspect for second frame as well
      oma: support for encrypted files
      id3v2: add support for non-text and GEOB type tag frames
      des: add possibility to calculate DES-CBC-MAC with small buffer
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/dct-test.c
    	libavformat/mpegts.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3e1a7ae4
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...
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...
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...
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...