1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer ec203cd69b Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-02 11:41:31 +01:00
compat
doc doc/examples/demuxing: use AVFrame accessor functions 2013-03-01 22:40:50 +01:00
libavcodec Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9' 2013-03-02 11:41:31 +01:00
libavdevice v4l2: fix regression that caused ffmpeg to occasionally get stuck 2013-03-02 01:55:08 +01:00
libavfilter lavfi/af_aresample: fix info log for unknown layouts. 2013-02-28 19:23:12 +01:00
libavformat Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9' 2013-03-02 11:41:31 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-03-01 13:50:19 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample soxr: libsoxr 0.1.1 support 2013-03-01 14:38:02 +01:00
libswscale swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB 2013-02-27 09:51:43 -05:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-02-28 13:13:04 +01:00
tools Include fix for building ismindex under MinGW 2013-02-27 10:13:09 -07:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak
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 'cb6f8245aed2c26fe95c30cd68c45983277a945a' 2013-03-01 12:48:55 +01:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure build: make iconv build configurable. 2013-02-28 01:23:24 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: Force a first_pts of 0 for the first configuration of -async use 2013-02-25 04:39:26 +01:00
ffmpeg_opt.c Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311' 2013-03-01 12:57:17 +01:00
ffmpeg.c Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311' 2013-03-01 12:57:17 +01:00
ffmpeg.h ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
ffplay.c ffplay: use AVFrame accessor functions 2013-03-01 23:22:08 +01:00
ffprobe.c ffprobe: use AVFrame accessor functions 2013-03-01 23:18:22 +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 Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3' 2013-02-28 12:49:25 +01: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
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.