FFmpeg git repo
Go to file
Michael Niedermayer 65dcb54493 Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
  hls: Respect the different stream time bases when comparing dts

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 14:18:37 +02:00
compat
doc ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
libavcodec Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f' 2013-07-29 12:09:38 +02:00
libavdevice
libavfilter Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libavformat Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81' 2013-07-29 14:18:37 +02:00
libavresample
libavutil Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2' 2013-07-28 13:44:34 +02:00
libpostproc
libswresample
libswscale
presets
tests ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c ffprobe: add -show_programs option 2013-07-28 16:39:06 +02:00
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.