• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 411cc5c4
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      audioconvert: add explanatory comments to channel_names array
      audioconvert: K&R whitespace cosmetics
      avconv: use correct index when selecting metadata to write to.
      avconv: fix inverted variable
      doc/avconv: document option types (input/output/per-stream/...)
      doc/avtools-common-opts: write a section about stream specifiers.
      doc/avconv: remove two pointless paragraphs.
      doc/avconv: document that global options should be specified first.
      doc/avconv: remove entries for nonexistent options
      doc/avconv: remove documentation for removed 'timestamp' option
      doc: cosmetics, rename fftools-common-opts to avtools-....
      avconv: move streamid_map to options context.
      avconv: extend -vf syntax
      avconv: move top_field_first to options context.
      avconv: move inter/intra matrix to options context.
      avconv: remove -psnr option.
      avconv: remove me_threshold option.
      avconv: move video_rc_override_string to options context.
      avconv: move frame pixel format to the options context.
      avconv: move frame aspect ratio to the options context.
      ...
    
    Conflicts:
    	avconv.c
    	cmdutils_common_opts.h
    	doc/avconv.texi
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    411cc5c4
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...