Go to file
Michael Niedermayer fabf69f37a Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'
* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 00:13:20 +01:00
compat Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA' 2014-03-06 20:44:33 +01:00
doc doc: fix typo 2014-03-07 17:07:37 -05:00
libavcodec dxva2_vc1: include the start code in wMBbitOffset 2014-03-07 16:03:50 +01:00
libavdevice lavd/Makefile: Add fbdev_common.h to SKIPHEADERS 2014-03-06 15:42:15 +01:00
libavfilter avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 2014-03-06 16:58:24 +01:00
libavformat Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a' 2014-03-08 00:13:20 +01:00
libavresample
libavutil Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7' 2014-03-07 12:44:09 +01:00
libpostproc
libswresample
libswscale
presets
tests mxf: Set audio packets pts 2014-03-06 19:28:20 +01:00
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak
Changelog Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2014-03-07 00:15:49 +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
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +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.