FFmpeg git repo
Go to file
Michael Niedermayer 67979b5936 Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'
* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
  segment: Report the current media sequence

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 20:14:50 +02:00
compat
doc lavd/pulse_audio_enc: add more buffer attributes 2014-04-30 00:35:42 +02:00
libavcodec avcodec/flacenc: Use av_malloc_array() 2014-04-30 18:28:40 +02:00
libavdevice lavd/pulse_audio_enc: respect minreq while checking buffer fullness 2014-04-30 00:36:14 +02:00
libavfilter lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
libavformat Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818' 2014-04-30 20:14:50 +02:00
libavresample
libavutil lavu/hash: add hash_final helpers. 2014-04-29 13:24:11 +02:00
libpostproc
libswresample Fix convertion typos 2014-04-29 00:09:08 +02:00
libswscale sws: dont use the optimized 410->420 unscaled conversion when height%4 2014-04-30 06:23:39 +02:00
presets
tests ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
tools lavc: add codec descriptors for TTF and OTF. 2014-04-29 13:24:18 +02:00
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
README
RELEASE
arch.mak
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h
cmdutils_common_opts.h
cmdutils_opencl.c
common.mak
configure Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a' 2014-04-29 01:47:53 +02:00
ffmpeg.c ffmpeg: dont print "Conversion failed" if conversion has never started 2014-04-29 23:45:22 +02:00
ffmpeg.h Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' 2014-04-29 01:22:22 +02:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +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
ffplay.c
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: do not ignore lseek() return 2014-04-29 01:08:06 -04:00
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.