1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer c867be03f6 Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'
* commit '6b7b8585d73548f08b98959df39d80b97677662f':
  dca: Convert dca_dmixtable to integers

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-23 19:01:12 +02:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc avformat: add av_stream_get_end_pts() 2014-05-21 18:53:12 +02:00
libavcodec Merge commit '6b7b8585d73548f08b98959df39d80b97677662f' 2014-05-23 19:01:12 +02:00
libavdevice avdevice/v4l2: Use av_malloc_array() 2014-05-22 15:08:12 +02:00
libavfilter lavfi/vf_fps: use av_fifo_alloc_array 2014-05-20 00:00:44 +02:00
libavformat avformat/mov: Dont blindly trust the stream duration in seting chapter times 2014-05-23 04:39:55 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil avutil/cpu: force mmx on selection of higher x86 SIMD features 2014-05-20 06:10:59 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: add swri_resample_float_avx 2014-05-16 05:27:03 +02:00
libswscale sws: document color range >8bit oddity 2014-05-21 21:29:33 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Set dwSuggestBufferSize to largest chunk size for every stream in avi. 2014-05-19 00:05:40 +02:00
tools tools: Use av_gettime_relative() 2014-05-17 15:51:58 +02:00
.gitignore gitignore: add tools/uncoded_frame 2014-05-06 14:14:32 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834' 2014-05-19 19:12:30 +02:00
cmdutils_common_opts.h Allow hiding the banner. 2013-12-29 22:57:20 +01:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c cmdutils: omit deprecated codec ids in help output 2014-04-29 22:13:35 +02:00
cmdutils.h cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32 2014-05-17 13:18:29 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure Fix build with --enable-ladspa --disable-frei0r. 2014-05-20 21:13:50 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
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 ffmpeg: use av_stream_get_end_pts() 2014-05-21 18:53:42 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: use av_stream_get_end_pts() 2014-05-21 18:53:42 +02:00
ffmpeg.h ffmpeg: use av_stream_get_end_pts() 2014-05-21 18:53:42 +02:00
ffplay.c ffplay: Use av_gettime_relative() 2014-05-17 20:28:16 +02:00
ffprobe.c ffprobe: Use av_malloc_array() 2014-05-21 15:59:22 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE Add libx265 encoder 2014-02-12 13:13:17 +00:00
MAINTAINERS maintainers: adding myself as a maintainer to webm dash 2014-05-22 20:09:06 +02:00
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +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.