• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8709ba90
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8709ba90
parseutils.h 4.54 KB