FFmpeg git repo
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 lavfi/frei0r: factorize plugin loading with static path 2014-02-26 22:48:37 +01:00
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 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog update for 2.2 2014-03-01 03:34:59 +01:00
INSTALL
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak
configure Merge commit '34150be515cd9c43b0b679806b8d01774960af78' 2014-03-01 12:27:59 +01:00
ffmpeg.c Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffmpeg.h Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check 2014-02-25 00:05:37 +01:00
ffmpeg_vdpau.c
ffplay.c
ffprobe.c
ffserver.c
library.mak
version.sh

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.