FFmpeg git repo
Go to file
Michael Niedermayer 96b02460fc Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'
* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8':
  configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 21:35:56 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc Merge remote-tracking branch 'qatar/master' 2014-03-13 14:21:27 +01:00
libavcodec Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5' 2014-03-13 21:26:49 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2014-03-13 14:21:27 +01:00
libavresample
libavutil avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use 2014-03-13 17:32:15 +01:00
libpostproc
libswresample
libswscale
presets
tests Add fieldmatch test 2014-03-10 02:59:01 +01:00
tools tools/build_libstagefright: switch git urls to https 2014-03-12 23:07:00 +01:00
.gitignore
arch.mak
Changelog lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c avconv: Match stream id 2014-03-13 11:59:34 +01:00
cmdutils.h
common.mak
configure Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8' 2014-03-13 21:35:56 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
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.