Michael Niedermayer 8709ba907a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegaudiodec: Don't use a nonexistent log context for av_dlog
  avformat: Accept the ISO8601 separate format as input, too
  avformat: Interpret times in ff_iso8601_to_unix_time as UTC
  avutil: Add av_timegm as a public function
  cinepak: Add another special case so that it can handle the following file:
  lagarith: add some RGBA decoding support
  lagarith: Add correct line prediction for RGB

Conflicts:
	doc/APIchanges
	libavcodec/cinepak.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 02:44:33 +01:00
..
2011-08-09 19:56:21 +02:00
2011-09-27 22:00:20 +02:00
2011-11-16 18:40:03 +01:00
2011-08-09 19:56:25 +02:00
2011-11-13 23:35:45 +01:00
2011-11-13 23:35:45 +01:00
2011-11-12 01:21:01 +01:00
2011-10-27 00:25:32 +02:00