1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer fb61ed1e9f Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
  On2 VP7 decoder

Conflicts:
	Changelog
	libavcodec/arm/h264pred_init_arm.c
	libavcodec/arm/vp8dsp.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/arm/vp8dsp_init_armv6.c
	libavcodec/arm/vp8dsp_init_neon.c
	libavcodec/avcodec.h
	libavcodec/h264pred.c
	libavcodec/version.h
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c
	libavcodec/vp8dsp.h
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 14:46:10 +02:00
compat
doc On2 VP7 decoder 2014-04-04 04:00:11 +02:00
libavcodec Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f' 2014-04-04 14:46:10 +02:00
libavdevice Add Win32 GDI-based screen grabbing 2014-04-03 00:41:45 +02:00
libavfilter avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props 2014-04-03 13:49:13 +02:00
libavformat On2 VP7 decoder 2014-04-04 04:00:11 +02:00
libavresample
libavutil log: allow color highlighting in Cygwin's mintty 2014-04-04 04:20:14 +02:00
libpostproc
libswresample
libswscale swscale: add full bgra64 support 2014-04-02 19:44:08 +02:00
presets
tests swscale: add full bgra64 support 2014-04-02 19:44:08 +02:00
tools
.gitignore
arch.mak
Changelog On2 VP7 decoder 2014-04-04 04:00:11 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure On2 VP7 decoder 2014-04-04 04:00:11 +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
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINER: Add CC for dshow maintainer 2014-04-03 01:41:23 +02:00
Makefile Makefile: fix out of tree builds of .m files 2014-04-01 05:12:39 +02:00
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.