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
2011-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2011-08-03 11:56:58 +03:00
2011-06-02 05:12:10 +02:00
2011-07-02 18:24:41 +01:00
2011-08-31 13:19:14 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 08:56:24 +01:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-30 04:32:24 +02:00
2011-06-24 03:07:04 +02:00
2011-07-22 12:08:52 +02:00
2011-07-21 16:28:53 +02:00
2011-07-22 12:08:52 +02:00
2011-09-29 01:11:01 +02:00
2011-05-27 23:48:22 +02:00
2011-07-22 12:08:52 +02:00
2011-09-29 01:11:01 +02:00
2011-06-24 03:07:04 +02:00
2011-07-06 01:34:08 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-08-24 17:57:40 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-08-24 17:57:40 +02:00
2011-07-11 04:23:25 +02:00
2011-06-13 12:30:22 +01:00
2011-10-03 01:49:36 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2011-06-13 11:33:44 +01:00
2011-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-07-16 19:43:35 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-05-22 04:53:19 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-06-24 03:07:04 +02:00
2f9d6ffda7