From: Michael Niedermayer Date: Thu, 17 Nov 2011 01:44:33 +0000 (+0100) Subject: Merge remote-tracking branch 'qatar/master' X-Git-Tag: n0.9~380 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/8709ba907a7f6f44e392161221d9628fa74b22f6 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 --- 8709ba907a7f6f44e392161221d9628fa74b22f6 diff --cc doc/APIchanges index 8a2a9de,c45aca6..03f7d46 --- a/doc/APIchanges +++ b/doc/APIchanges @@@ -13,12 -13,9 +13,15 @@@ libavutil: 2011-04-1 API changes, most recent first: +2011-11-03 - 96949da - lavu 51.23.0 + Add av_strcasecmp() and av_strncasecmp() to avstring.h. + +2011-10-20 - b35e9e1 - lavu 51.22.0 + Add av_strtok() to avstring.h. + + 2011-11-xx - xxxxxxx - lavu 51.16.0 + Add av_timegm() + 2011-11-06 - ba04ecf - lavu 51.14.0 Add av_strcasecmp() and av_strncasecmp() to avstring.h. diff --cc libavutil/avutil.h index 72cfb8a,436f79b..0fa46b8 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@@ -40,7 -40,7 +40,7 @@@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 51 - #define LIBAVUTIL_VERSION_MINOR 25 -#define LIBAVUTIL_VERSION_MINOR 16 ++#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \