Go to file
Michael Niedermayer 989fb05fe3 Merge remote branch 'qatar/master'
* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-25 02:29:09 +02:00
doc general.texi: document libcelt decoder. 2011-04-24 17:49:07 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec Merge remote branch 'qatar/master' 2011-04-25 02:29:09 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
libavfilter mp: remove unused variable outlink in end_frame 2011-04-21 18:46:03 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-25 02:29:09 +02:00
libavutil Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
libpostproc libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
libswscale Check mmap() return against correct value 2011-04-25 01:54:29 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests avi: try to synchronize the points in time of the starts of streams after seeking. 2011-04-24 22:38:05 +02:00
tools Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
.gitignore Remove stray libavcore and _g binary references. 2011-04-23 14:23:20 +02:00
Changelog Remove stray libavcore and _g binary references. 2011-04-23 14:23:20 +02:00
cmdutils_common_opts.h
cmdutils.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-04-25 02:29:09 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffplay.c ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay 2011-04-24 23:10:26 +02:00
ffprobe.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.