• Michael Niedermayer's avatar
    Merge commit '28c8e288' · bf2f93cd
    Michael Niedermayer authored
    * commit '28c8e288':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bf2f93cd
h264_chromamc.asm 17.5 KB