Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Nov 2012 23:43:45 +0000 (00:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Nov 2012 23:43:45 +0000 (00:43 +0100)
commitbf2f93cdbf15c96c62b5112c1ab7f8093177e508
tree02992eb3142695332689898d713bef0653f3aa32
parentb473c9937ebe9aafef9d2e07f080fb12ecc53ef4
parent28c8e288fa0342fdef532a7522a4707bebf831cc
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'

* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/avtools-common-opts.texi
ffmpeg_opt.c
libavcodec/x86/h264_chromamc.asm
libavformat/riff.c