1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Go to file
Michael Niedermayer 146b476ba0 Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 21:33:44 +01:00
compat
doc doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output 2014-03-05 16:10:06 +01:00
libavcodec Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d' 2014-03-05 21:33:44 +01:00
libavdevice lavd/avdevice: add device iterators 2014-03-03 23:39:07 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2014-03-05 13:51:44 +01:00
libavformat avformat/oggparsevorbis: dont use invalid granules 2014-03-05 17:07:28 +01:00
libavresample
libavutil Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54' 2014-03-04 21:55:16 +01:00
libpostproc
libswresample
libswscale
presets
tests
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore
arch.mak
Changelog update for 2.2 2014-03-01 03:34:59 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24' 2014-03-05 13:45:23 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
version.sh

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.