1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer efcc334c9d Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'
* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 21:38:17 +02:00
compat Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
doc img2dec: Add ts_from_file option 2013-05-25 11:42:28 +02:00
libavcodec mpegvideo_enc: do not unreference frames before the code is done with them 2013-05-25 20:30:50 +02:00
libavdevice v4l2: make possible to disable libv4l2 at runtime. 2013-05-22 19:49:29 +02:00
libavfilter lavfi/afade: add timeline support 2013-05-25 13:20:27 +00:00
libavformat avformat/mov: Rename alt_sample_size so its name matches what it is 2013-05-25 18:47:36 +02:00
libavresample
libavutil avutil/md5: reindent after previous commits 2013-05-25 16:11:08 +02:00
libpostproc postproc/postprocess_template: remove empty comments 2013-05-23 14:39:58 +02:00
libswresample
libswscale add YUVJ411P 2013-05-21 12:56:11 +02:00
presets
tests fade: fix slice sizes 2013-05-24 17:47:02 +02:00
tools tools/patcheck: fix misdetection with stuff like const_names 2013-05-23 19:11:28 +02:00
.gitignore
arch.mak
Changelog Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' 2013-05-24 14:07:00 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
cmdutils.h
common.mak
configure Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a' 2013-05-25 21:38:17 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS Support playing SMV files. 2013-05-22 15:20:22 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +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.