Michael Niedermayer 2f9d6ffda7 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>

2011-10-04 03:24:59 +02:00

17 KiB

Raw Blame History

View Raw