1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 6f9be8120d Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'
* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
  build: Add rule for building host-specific object files

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 20:17:36 +01:00
compat
doc doc/examples/filtering_audio: fix chunked audio decoding 2013-12-02 15:21:52 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-12-02 10:59:48 +01:00
libavdevice
libavfilter Revert "vf_yadif: move x86 init code to x86/yadif.c" 2013-12-01 20:26:26 +01:00
libavformat avformat/avisynth: remove duplicate av_new_packet() call 2013-12-01 22:12:57 +01:00
libavresample
libavutil libavutil & opencl: remove opencl default device type 2013-12-02 12:07:27 +01:00
libpostproc
libswresample
libswscale
presets
tests vp9: add a new segmentation sample. 2013-11-30 16:26:14 -05:00
tools
.gitignore Merge commit '3cd612d44789948f72b52944474e0870c5c60964' 2013-12-01 21:18:11 +01:00
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
cmdutils.h
common.mak Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276' 2013-12-02 20:17:36 +01:00
configure configure: put pthread_create() check back 2013-12-02 11:11:56 +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 build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
ffserver.c ffserver: print error code description in case of write_header() failure 2013-11-30 14:35:33 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile build: Add rule for building host-specific object files 2013-12-02 13:13:09 +01:00
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

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.