FFmpeg git repo
Go to file
Michael Niedermayer 54056c1493 Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'
* commit 'cf679b9476727a237c8006c685ace18acba149ab':
  hls, segment: fix splitting for audio-only streams.

Conflicts:
	libavformat/hlsenc.c
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 11:48:40 +02:00
compat
doc doc/filters: update/extend transpose filter documentation 2013-04-27 20:34:02 +02:00
libavcodec ffv1enc: favor version 3 over 2 unless -strict -2 is set 2013-04-27 22:48:13 +02:00
libavdevice
libavfilter lavfi/transpose: reindent constants 2013-04-27 20:33:54 +02:00
libavformat Merge commit 'cf679b9476727a237c8006c685ace18acba149ab' 2013-04-28 11:48:40 +02:00
libavresample
libavutil lavu/mem: remove redundant comment from av_dynarray_add() 2013-04-27 20:34:10 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge remote-tracking branch 'qatar/master' 2013-04-27 11:35:03 +02:00
tools
.gitignore
arch.mak
Changelog astats filter 2013-04-27 12:40:34 +00: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
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.