FFmpeg git repo
Go to file
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
doc Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
libavfilter mandelbrot: make mincol description and code match. 2011-11-16 15:13:01 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
libpostproc
libswresample swr: replace deprecated av_set_int() with av_opt_set_int(). 2011-11-16 07:27:20 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
mt-work
presets
tests Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
tools
.gitignore
avconv.c
Changelog ffprobe: add csv writer 2011-11-16 18:40:03 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c
ffplay.c
ffprobe.c ffprobe: small align cosmetic in json writer struct init. 2011-11-16 19:37:11 +01:00
ffserver.c
INSTALL
LICENSE
MAINTAINERS Update my GnuPG fingerprint. 2011-11-15 18:13:59 +01:00
Makefile
README
RELEASE RELEASE: bump to 0.8.6.git after the release 2011-11-12 21:00:13 +01:00
subdir.mak
version.sh

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.