You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
Michael Niedermayer 85d2b0987b Merge commit '84bf8817206126dab3c9abf6055b593389bcb241' 11 years ago
compat Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA' 11 years ago
doc Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 11 years ago
libavcodec Fix spelling error 'Inconsistant -> Inconsistent' 11 years ago
libavdevice lavd/Makefile: Add fbdev_common.h to SKIPHEADERS 11 years ago
libavfilter avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 11 years ago
libavformat Merge remote-tracking branch 'lukaszmluki/master' 11 years ago
libavresample Merge remote-tracking branch 'qatar/master' 11 years ago
libavutil Revert "lavu/buffer: add release function" 11 years ago
libpostproc postproc: fix null pointer dereference with invalid option strings 11 years ago
libswresample swr: check that the context for swr_convert() has been initialized 11 years ago
libswscale libswscale: bayer to rgb24 & yv12 colorspace converters 11 years ago
presets presets: specify the codecs. 13 years ago
tests Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f' 11 years ago
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 11 years ago
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 11 years ago
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 16 years ago
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 16 years ago
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 13 years ago
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 16 years ago
CREDITS CREDITS: redirect to Git log, remove current outdated content 12 years ago
Changelog Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 11 years ago
INSTALL Merge remote branch 'qatar/master' 14 years ago
LICENSE Add libx265 encoder 11 years ago
MAINTAINERS update for 2.2 11 years ago
Makefile tools: add uncoded_frame test program. 11 years ago
README README: be a tiny bit more verbose 13 years ago
RELEASE RELEASE: update for 2.2 11 years ago
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 12 years ago
cmdutils.c cmdutils: update copyright year to 2014. 11 years ago
cmdutils.h Allow hiding the banner. 11 years ago
cmdutils_common_opts.h Allow hiding the banner. 11 years ago
cmdutils_opencl.c cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices 11 years ago
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 11 years ago
configure Merge commit '84bf8817206126dab3c9abf6055b593389bcb241' 11 years ago
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 11 years ago
ffmpeg.h Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 11 years ago
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 11 years ago
ffmpeg_opt.c ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check 11 years ago
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 11 years ago
ffplay.c Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d' 11 years ago
ffprobe.c ffprobe: check av_frame_alloc() failure. 11 years ago
ffserver.c ffserver: merge RTSP's teardown & pause routines 11 years ago
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 11 years ago
version.sh version.sh: add preprocessing guards 11 years ago

README

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.