• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f884ef00
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      tiffenc: initialize forgotten avctx.
      avplay: free the active audio packet at exit.
      avplay: free rdft data used for spectrogram analysis.
      log.h: make AVClass a named struct
      fix ac3 encoder documentation
      vc1: more prettyprinting cosmetics
      vc1: prettyprint some tables
      vc1: K&R formatting cosmetics
      AVOptions: bump minor and add APIchanges entry.
      cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
      AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
      Remove all uses of deprecated AVOptions API.
      AVOptions: add av_opt_next, deprecate av_next_option.
      AVOptions: add functions for evaluating option strings.
      AVOptions: split get_number().
      AVOptions: add av_opt_get*, deprecate av_get*.
      AVOptions: add av_opt_set*().
      AVOptions: add new API for enumerating children.
      rv34: move inverse transform functions to DSP context
      flvenc: Write the right metadata entry count
      ...
    
    Conflicts:
    	avconv.c
    	cmdutils.c
    	doc/APIchanges
    	ffplay.c
    	ffprobe.c
    	libavcodec/ac3dec.c
    	libavcodec/h264.c
    	libavcodec/libvpxenc.c
    	libavcodec/libx264.c
    	libavcodec/mpeg12enc.c
    	libavcodec/options.c
    	libavdevice/libdc1394.c
    	libavdevice/v4l2.c
    	libavfilter/vf_drawtext.c
    	libavformat/flvdec.c
    	libavformat/mpegtsenc.c
    	libavformat/options.c
    	libavutil/avutil.h
    	libavutil/opt.c
    	libswscale/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f884ef00
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...