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)
* 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>
1  2 
configure
doc/avtools-common-opts.texi
ffmpeg_opt.c
libavcodec/x86/h264_chromamc.asm
libavformat/riff.c

diff --cc configure
Simple merge
Simple merge
diff --cc ffmpeg_opt.c
Simple merge
Simple merge
@@@ -640,6 -568,13 +633,13 @@@ void ff_riff_write_info_tag(AVIOContex
      }
  }
  
 -    "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
+ static const char riff_tags[][5] = {
+     "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
+     "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
++    "IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH",
+     {0}
+ };
  static int riff_has_valid_tags(AVFormatContext *s)
  {
      int i;