Go to file
Michael Niedermayer 217f6c53e5 Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'
* commit '5a70a783f04919514efec7751d710b64d8975fd7':
  hls: Add an option to prepend a baseurl to the playlist entries

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 16:37:22 +02:00
compat
doc Merge commit '5a70a783f04919514efec7751d710b64d8975fd7' 2014-04-29 16:37:22 +02:00
libavcodec avcodec/mpegvideo: fix null pointer dereference 2014-04-29 14:52:12 +02:00
libavdevice Fix convertion typos 2014-04-29 00:09:08 +02:00
libavfilter avfilter/graphdump: Fix pointer to local outside scope 2014-04-28 04:01:50 +02:00
libavformat Merge commit '5a70a783f04919514efec7751d710b64d8975fd7' 2014-04-29 16:37:22 +02:00
libavresample
libavutil avutil/log: fix memleak from 669a09fb37 2014-04-29 03:13:51 +02:00
libpostproc
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale
presets
tests avformat/utils: prevent r frame rate from being set larger than 1/tb 2014-04-28 15:49:51 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c ffmpeg_dxva2: fix mixing of declarations and statements 2014-04-29 01:54:42 +02:00
ffmpeg_filter.c ffmpeg_filter: make *jpeg_formats static const 2014-04-28 00:22:38 +02:00
ffmpeg_opt.c Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: print an error at the end if conversion failed 2014-04-29 00:09:08 +02:00
ffmpeg.h Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
ffplay.c
ffprobe.c
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02: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.