diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-17 02:44:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-17 02:44:33 +0100 |
| commit | 8709ba907a7f6f44e392161221d9628fa74b22f6 (patch) | |
| tree | 027c6658a2d564cf9c8d2150fd5f14633e9e4d65 /tools | |
| parent | 4f7ad4c3e460a7dfe4e3186c73ad73db29336488 (diff) | |
| parent | 268fb3f9851590aed724dba83d3999c8369c929f (diff) | |
| download | ffmpeg-8709ba907a7f6f44e392161221d9628fa74b22f6.tar.gz | |
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>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions