-
- Downloads
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>
Showing
- doc/APIchanges 3 additions, 0 deletionsdoc/APIchanges
- libavcodec/cinepak.c 1 addition, 1 deletionlibavcodec/cinepak.c
- libavcodec/lagarith.c 72 additions, 5 deletionslibavcodec/lagarith.c
- libavformat/utils.c 9 additions, 3 deletionslibavformat/utils.c
- libavutil/avutil.h 1 addition, 1 deletionlibavutil/avutil.h
- libavutil/parseutils.c 2 additions, 2 deletionslibavutil/parseutils.c
- libavutil/parseutils.h 7 additions, 0 deletionslibavutil/parseutils.h
Loading
Please register or sign in to comment