FFmpeg git repo
Go to file
Michael Niedermayer 402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:00:48 +01:00
compat
doc Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 2014-01-10 03:00:48 +01:00
libavcodec avcodec/mjpegdec: allow lowres with amv 2014-01-09 21:40:13 +01:00
libavdevice
libavfilter Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 2014-01-10 03:00:48 +01:00
libavformat Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558' 2014-01-10 02:32:12 +01:00
libavresample
libavutil Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69' 2014-01-08 05:36:56 +01:00
libpostproc
libswresample
libswscale swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-08 17:17:34 +01:00
presets
tests avformat/rmdec: when reading audio blocks, dont leave holes when reading fails 2014-01-09 23:50:59 +01:00
tools tools/qt-faststart: add -movflags +faststart note 2014-01-07 10:59:04 -09:00
.gitignore
arch.mak
Changelog Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 2014-01-10 03:00:48 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure ATRAC3+ decoder 2014-01-09 19:33:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
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.