1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 11146a9b44 Merge commit '34150be515cd9c43b0b679806b8d01774960af78'
* commit '34150be515cd9c43b0b679806b8d01774960af78':
  build: Let the iac decoder depend on the imc decoder

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 12:27:59 +01:00
compat
doc update for 2.2 2014-03-01 03:34:59 +01:00
libavcodec Merge commit '34150be515cd9c43b0b679806b8d01774960af78' 2014-03-01 12:27:59 +01:00
libavdevice
libavfilter
libavformat avformat/ac3dec: Use avpriv_ac3_parse_header2() 2014-03-01 01:56:25 +01:00
libavresample
libavutil avutil/opt: allow max=min=0 for pixel formats 2014-03-01 00:31:38 +01:00
libpostproc
libswresample
libswscale
presets
tests
tools
.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 '34150be515cd9c43b0b679806b8d01774960af78' 2014-03-01 12:27:59 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
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
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.