1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 3d7218d932 Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13 22:40:32 +02:00
compat
doc avcodec: add option to make is_intra_more_likely() from error concealment return "no" 2014-05-12 22:55:39 +02:00
libavcodec Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavdevice Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavfilter Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavformat Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f' 2014-05-12 00:37:12 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample inline asm: fix arrays as named constraints. 2014-05-07 15:02:45 +02:00
libswscale Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
presets
tests avcodec/huffyuvenc: Make version 3 of ffvhuff non experimental 2014-05-07 23:24:38 +02:00
tools tools/ismindex: use av_mallocz_array() 2014-05-05 18:47:24 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak
Changelog Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 2014-05-01 14:14:10 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL 2014-05-07 06:14:57 +02:00
common.mak Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
configure Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c Merge commit '9580818c5d934bde65a95efd2cee61c174721092' 2014-05-05 15:51:55 +02:00
ffmpeg_opt.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: use av_fifo_freep 2014-05-07 23:39:47 +02:00
ffmpeg.h Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: use the codec descriptor if no decoder was found. 2014-04-29 13:25:59 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file 2014-05-04 18:57:15 +02:00
Makefile Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +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.