Go to file
Michael Niedermayer 93318983c3 Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'
* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
  hevc: templatize pred_planar

Conflicts:
	libavcodec/hevcpred_template.c

See: 053fdacde7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 13:56:56 +02:00
compat
doc Merge commit '33082af7560a18179b52734665ef66f812902d33' 2014-05-18 20:57:41 +02:00
libavcodec Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb' 2014-05-19 13:56:56 +02:00
libavdevice lavd: Use av_gettime_relative() 2014-05-18 16:10:12 +02:00
libavfilter avfilter/edgedetect: reuse already defined ctx. 2014-05-17 14:16:04 +02:00
libavformat Set dwSuggestBufferSize to largest chunk size for every stream in avi. 2014-05-19 00:05:40 +02:00
libavresample Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
libavutil lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
libpostproc
libswresample swresample: add swri_resample_float_avx 2014-05-16 05:27:03 +02:00
libswscale swscale/utils: Add check that ensures that the hardcoded struct offsets are valid 2014-05-14 01:32:11 +02:00
presets
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
arch.mak
Changelog Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222' 2014-05-15 18:20:17 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c
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 '7e90133f6420b1c53652f972b9561600822881ee' 2014-05-14 14:02:19 +02:00
configure configure: make vp9 decoder select the parser. 2014-05-17 16:13:42 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
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_gettime_relative() 2014-05-19 02:35:07 +02:00
ffmpeg.h Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffplay.c ffplay: Use av_gettime_relative() 2014-05-17 20:28:16 +02:00
ffprobe.c ffprobe: fix crash happening because of new streams occuring 2014-05-18 20:04:02 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +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.