Go to file
Michael Niedermayer 845bf99312 Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'
* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
  build: Add proper infrastructure for adding and checking host CPPFLAGS

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 15:24:38 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608' 2013-02-24 14:32:55 +01:00
libavcodec Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608' 2013-02-24 14:32:55 +01:00
libavdevice v4l2: try to fix build on BSD 2013-02-18 00:53:17 +01:00
libavfilter lavfi/formats: reindent after last commit. 2013-02-24 12:05:06 +01:00
libavformat Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10' 2013-02-24 13:15:59 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-02-13 12:58:29 +01:00
libavutil Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855' 2013-02-24 12:22:51 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: check channel layouts before using them. 2013-02-13 17:50:24 +01:00
libswscale sws/x86: improve rounding for yuv2yuvX 2013-02-15 23:33:04 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate/subtitles: add character encoding conversion test. 2013-02-23 00:24:02 +01:00
tools tools: add seek_print. 2013-02-24 13:12:46 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog blend filter 2013-02-21 20:16:23 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793' 2013-02-16 13:13:42 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: set resample_pix_fmt for sub2video. 2013-02-21 12:41:30 +01:00
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 01:26:26 +01:00
ffmpeg.c ffmpeg: Check for parameter changes at the output of the audio filter graph 2013-02-14 23:56:51 +01:00
ffmpeg.h ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
ffplay.c ffplay: only display frames if there are no pending events 2013-02-15 13:12:10 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE lavfi: port MP noise filter 2013-02-16 11:42:41 +00:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01: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.