• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2f9d6ffd
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2f9d6ffd
id3v2.c 16.9 KB