No description
Find a file
Michael Niedermayer 6912e7a008 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 13:18:59 +02:00
compat Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
doc examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame() 2012-10-20 12:06:45 +02:00
libavcodec Merge commit 'c9ef43215c' 2012-10-20 12:37:52 +02:00
libavdevice caca: fix 10l typo 2012-10-12 19:05:58 +02:00
libavfilter vf_mp: fix null ptr deref in case of ENOMEM 2012-10-19 19:59:38 +02:00
libavformat Merge commit 'c9ef43215c' 2012-10-20 12:37:52 +02:00
libavresample Merge commit 'b5198a2637' 2012-10-14 14:46:13 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample swresample: include ff_log2_tab for shared builds 2012-10-20 01:58:04 +02:00
libswscale sws-test: parse command line args before initing contexts 2012-10-17 11:56:36 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit 'c9ef43215c' 2012-10-20 12:37:52 +02:00
tools tools/ffeval: do not use UNIX-specific /dev/std{in,out} files 2012-10-16 13:51:44 +02:00
.gitignore Merge commit 'c9ef43215c' 2012-10-20 12:37:52 +02:00
arch.mak Merge commit 'ca411fc1d3' 2012-10-13 15:25:11 +02:00
Changelog Merge commit '0af1fe845a' 2012-10-19 13:47:47 +02:00
cmdutils.c cmdutils: add missing check for ftell() return 2012-10-18 00:10:59 +02:00
cmdutils.h Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
cmdutils_common_opts.h cmdutils: add -layouts option. 2012-08-28 15:09:49 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
ffmpeg.c ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffmpeg.h ffmpeg: Make video filter graph reinit user selectable 2012-10-17 00:06:12 +02:00
ffmpeg_filter.c ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams 2012-10-16 01:04:42 +02:00
ffmpeg_opt.c Merge commit '71e92414bf' 2012-10-17 14:30:25 +02:00
ffplay.c ffplay: Prevent 0/0 aspect from being passed on to lavfi 2012-10-14 23:40:14 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c ffm_read_write_index: check lseek return code 2012-10-17 20:35:16 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
LICENSE LICENSE: correct incorrect claims on *GPL incompatibility 2012-08-16 04:47:18 +02:00
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-16 14:15:16 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.