1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Go to file
Michael Niedermayer c9e0f7a080 Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'
* commit '99e22b7859177f6d3ed6121040924b337dce5497':
  mov: Emit the correct tags for clcp tracks

Conflicts:
	libavformat/movenc.c

See: a5f6720f13
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25 21:33:18 +02:00
compat
doc Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 2014-04-23 20:47:13 +02:00
libavcodec avcodec/mdct_template: Use av_malloc_array() 2014-04-25 15:07:31 +02:00
libavdevice avdevice/qtkit: fix include 2014-04-24 05:12:07 +02:00
libavfilter Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS. 2014-04-24 17:50:27 +02:00
libavformat Merge commit '99e22b7859177f6d3ed6121040924b337dce5497' 2014-04-25 21:33:18 +02:00
libavresample Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavutil lavu: add LOCAL_ALIGNED_32 2014-04-25 06:12:51 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: add swri_resample_double_sse2 2014-04-25 16:46:07 +02:00
libswscale
presets
tests swresample: add swri_resample_double_sse2 2014-04-25 16:46:07 +02:00
tools
.gitignore examples: rename avcodec.c to decoding_encoding.c 2014-04-23 10:32:42 +02:00
arch.mak
Changelog Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 2014-04-23 20:47:13 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure lavu: add LOCAL_ALIGNED_32 2014-04-25 06:12:51 +02: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 ffprobe: fix scaling of vali in value_string() in case -prefix is selected 2014-04-23 10:32:42 +02:00
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.