ffmpeg/libavutil
Michael Niedermayer 411cc5c46a Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 00:32:54 +02:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86
Makefile
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
base64.c
base64.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c avopt: Fix searching for constants 2011-09-08 05:34:17 +02:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
timer.h
tree.c
tree.h
utils.c
x86_cpu.h