1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-06 02:59:49 +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-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-04 02:15:12 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-03 16:40:10 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 01:09:04 +02:00
2011-04-03 02:28:01 +02:00
2011-04-02 01:54:27 +02:00
2011-03-28 21:50:46 -07:00
2011-04-06 23:21:44 +02:00
2011-04-06 01:09:04 +02:00
2011-04-06 01:09:04 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-06 02:59:49 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 02:28:01 +02:00
2011-03-19 15:24:31 +00:00
2011-03-28 00:16:44 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 02:59:49 +02:00
2011-04-04 15:35:03 +02:00