Michael Niedermayer
c0e51ec9c6
Merge remote branch 'qatar/master'
...
* qatar/master:
Fix parser: mark av_parser_parse() for removal on next major bump
swscale: postpone sws_getContext removal until next major bump.
fate: add AAC LATM test
mmst: get rid of deprecated AVERRORs
lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-07 03:32:26 +02:00
..
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-06 19:30:42 +02:00
2011-03-23 02:42:56 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-04-07 03:32:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-03 16:40:11 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-03 16:40:11 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-06 02:59:49 +02:00
2011-04-06 02:59:49 +02:00
2011-04-06 02:59:49 +02:00
2011-04-06 02:59:49 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-29 02:46:11 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-25 02:57:41 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-01 17:38:29 +02:00
2011-04-03 20:29:04 -04:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-23 02:42:56 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-01 23:11:24 +11:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-23 07:30:15 -04:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-01-30 03:40:58 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-04-03 16:40:12 +02:00
2011-04-06 19:30:42 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-23 02:42:56 +01:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-06 01:09:04 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-26 13:24:45 +11:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2010-04-16 12:21:29 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-02-06 16:08:59 -05:00
2011-03-19 13:33:20 +00:00
2011-02-06 16:08:59 -05:00
2011-02-06 16:08:59 -05:00
2011-02-09 03:31:17 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-02-23 18:22:03 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-06 19:30:42 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-02 01:54:27 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-02 00:56:43 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-24 02:16:11 +01:00
2011-04-06 02:59:49 +02:00
2011-04-07 03:32:26 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-06 19:30:42 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00