No description
Find a file
Michael Niedermayer fa4e17c140 Merge commit 'b88cc5cca1'
* commit 'b88cc5cca1':
  bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext

Conflicts:
	libavcodec/bink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 19:28:54 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc avutil/opt: add av_opt_copy() 2014-06-01 20:49:18 +02:00
libavcodec Merge commit 'b88cc5cca1' 2014-06-02 19:28:54 +02:00
libavdevice avdevice/v4l2: Use av_malloc_array() 2014-05-22 15:08:12 +02:00
libavfilter Merge commit 'ad0fe2f401' 2014-05-29 01:24:48 +02:00
libavformat avformat/utils: Call ff_rfps_add_frame() only for video 2014-06-02 17:09:53 +02:00
libavresample Merge commit 'b2d4565422' 2014-05-29 01:23:22 +02:00
libavutil avutil/mathematics/av_add_stable: Avoid av_cmp_q() call 2014-06-02 19:06:39 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swr: move compensation_distance handling to swri_resample caller. 2014-06-02 15:06:24 +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 fate: fate-hevc-conformance-INITQP_B_Sony_1 belongs to the 10bit kind 2014-06-02 13:11:42 +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 '8675bcb0ad' 2014-04-07 02:15:18 +02:00
Changelog avcodec/webvttenc: add webvtt encoder 2014-05-25 03:04:14 +02:00
cmdutils.c ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
common.mak Merge commit 'afe1762654' 2014-05-20 03:33:30 +02:00
configure Merge commit '368f50359e' 2014-05-30 02:43:34 +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.c ffmpeg: Fix encoder names in printout 2014-06-01 17:15:56 +02:00
ffmpeg.h ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_dxva2.c Merge commit 'a7c5fddac8' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_opt.c ffmpeg_opt: fix ffserver with the 2 encoder contexts 2014-06-01 17:29:59 +02:00
ffmpeg_vda.c Merge commit '1839fafa95' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: support rotated video. 2014-05-23 23:30:21 +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.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'b339182eba' 2014-02-17 02:22:01 +01:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS libavformat: output cues for each subtitle block in MKV muxer 2014-05-31 13:26:48 +02:00
Makefile Merge commit '5e2ba41d4b' 2014-05-15 21:01:07 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.