Go to file
Michael Niedermayer 707e8612e8 Merge remote branch 'qatar/master'
* qatar/master:
  Implement fate-rsync target
  Make ffmpeg support generic data stream

Conflicts:
	cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 04:06:26 +02:00
doc Merge remote branch 'qatar/master' 2011-05-02 03:45:58 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec MS Video 1 encoder 2011-05-04 02:22:12 +02:00
libavdevice Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
libavfilter scale: fix leak occurring when a scale filter is reconfigured 2011-05-02 16:46:24 +02:00
libavformat Merge remote branch 'qatar/master' 2011-05-04 04:06:26 +02:00
libavutil AVOptions: av_set_string3() allow NULL strings 2011-05-02 02:58:09 +02:00
libpostproc libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
libswscale Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests msvideo1 regression test 2011-05-04 02:22:13 +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 DPX image encoder 2011-05-01 19:35:55 +02:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio 2011-05-01 13:10:18 +02:00
cmdutils.h Merge remote branch 'qatar/master' 2011-05-04 04:06:26 +02: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-29 04:29:21 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
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-05-04 04:06:26 +02:00
ffplay.c replace deprecated av_get_pict_type_char() with av_get_picture_type_char() 2011-05-02 16:41:35 +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-27 03:51:04 +02:00
ffserver.h Add FFMPEG_ prefix to all multiple inclusion guards. 2007-10-17 09:37:46 +00:00
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-05-04 04:06:26 +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.