FFmpeg git repo
Go to file
Michael Niedermayer a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 10:46:39 +01:00
compat
doc Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
libavcodec Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
libavdevice
libavfilter Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191' 2013-11-01 10:26:49 +01:00
libavformat Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
libavresample
libavutil
libpostproc
libswresample
libswscale Optimize pure C unscaled yuv2rgb. 2013-10-30 20:52:24 +01:00
presets
tests
tools
.gitignore
arch.mak
Changelog Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 2013-11-01 10:46:39 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add myself as libzvbi-teletextdec maintainer 2013-10-31 21:31:52 +01:00
Makefile build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +01:00
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.