FFmpeg git repo
Go to file
Michael Niedermayer f48366c704 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-24 11:42:42 +02:00
compat
doc Merge commit '95d52464542f532061290192518d5fe1c1930e8d' 2013-06-24 10:57:04 +02:00
libavcodec Merge commit '95d52464542f532061290192518d5fe1c1930e8d' 2013-06-24 10:57:04 +02:00
libavdevice avdevice/x11grab: allocate just one Cursor 2013-06-21 12:00:11 +02:00
libavfilter Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79' 2013-06-21 10:41:41 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-06-24 11:42:42 +02:00
libavresample
libavutil avutil/ripemd: adjust loop condition to silence CID1035716 2013-06-22 14:52:29 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample/x86/audio_convert: add emms to CONV 2013-06-18 02:26:36 +02:00
libswscale swscale: fix filter alignment reduction without inline asm 2013-06-21 21:01:11 +02:00
presets
tests lavu: Add RIPEMD hashing 2013-06-15 18:54:01 -03:00
tools
.gitignore
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
INSTALL
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS Add maintainer for WebVTT demuxer and muxer 2013-06-18 18:02:30 +02:00
Makefile
README
RELEASE
arch.mak
cmdutils.c cmdutils: dont change the log level for -report 2013-06-24 02:59:05 +02:00
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203' 2013-06-24 10:41:37 +02:00
ffmpeg.c Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 2013-06-23 12:56:55 +02:00
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c ffplay: remove remains of the old audio and video clock VideoState variables 2013-06-17 01:18:07 +02:00
ffprobe.c
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.