1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 5049b6a1fe Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'
* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
  mp3enc: add an option for disabling the Xing frame.

Conflicts:
	doc/muxers.texi
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17 15:23:11 +01:00
compat
doc Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd' 2014-01-17 15:23:11 +01:00
libavcodec vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2(). 2014-01-17 14:16:38 +01:00
libavdevice
libavfilter lavfi/vidstabtransform: apply various cosmetical nits 2014-01-16 12:35:17 +01:00
libavformat Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd' 2014-01-17 15:23:11 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-01-15 15:49:22 +01:00
libavutil Merge commit '045654f422e74be8ed09a0819d39051d67633a09' 2014-01-17 15:05:24 +01:00
libpostproc
libswresample
libswscale
presets
tests fate: add WebP Exif metadata test 2014-01-15 21:20:47 +01:00
tools Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928' 2014-01-17 14:38:33 +01:00
.gitignore
arch.mak
Changelog webp: fix capitalization of the word Exif 2014-01-15 02:54:36 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure configure: add version check for pkg libraries, and use it for vidstab 2014-01-16 12:35:04 +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.