Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Oct 2011 01:21:14 +0000 (03:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Oct 2011 01:24:59 +0000 (03:24 +0200)
commit2f9d6ffda78725e11b351a7a5d69414a32010810
treeb9bf0e40ad2b85a35af8b5c0b9b6d50c19ad5303
parent98df93c9fe2dd4698cd7b4d699b248cbfd1427b4
parent60df6b004858dcab96fc96c6dd32484780a8d7c3
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: remove pointless casts
  id3v2: read TXXX frames with two calls to decode_str() instead of one.
  id3v2: don't discard the whole tag when encountering empty frames.
  libvpx: fix build with older libvpx versions.
  ARM: check for inline asm 'y' operand modifier support

Conflicts:
libavcodec/libvpxenc.c
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/id3v2.c