Go to file
Michael Niedermayer 25be63005f Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25 14:36:45 +01:00
compat
doc Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' 2013-01-25 14:36:45 +01:00
libavcodec Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' 2013-01-25 14:36:45 +01:00
libavdevice
libavfilter lavfi/earwax: remove config_input() 2013-01-24 10:37:44 +00:00
libavformat lavf/img2enc: extend current options documentation 2013-01-25 00:04:23 +01:00
libavresample
libavutil Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' 2013-01-25 14:36:45 +01:00
libpostproc
libswresample
libswscale swscale: check flags instead of nb_components to find if pixel format have alpha 2013-01-25 13:06:00 +00:00
presets
tests lavu/eval: extend if/ifnot functions to accept a third parameter 2013-01-24 12:19:01 +01:00
tools
.gitignore
arch.mak
Changelog Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' 2013-01-25 14:36:45 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339' 2013-01-25 14:14:21 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: fix typo in open_files() message 2013-01-25 00:46:41 +01:00
ffmpeg.c ffmpeg: copy tmcd track timebase parameters 2013-01-24 18:37:32 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.