Go to file
Michael Niedermayer 14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 03:19:06 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc doc: add doxygen target tag 2014-07-08 02:11:19 +02:00
libavcodec Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 2014-07-08 03:19:06 +02:00
libavdevice avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h> 2014-07-08 02:48:51 +02:00
libavfilter Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 2014-07-08 03:19:06 +02:00
libavformat avformat/segment: simplify localtime* use 2014-07-07 22:57:36 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h> 2014-07-08 02:50:52 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample: misc. doxy improvements 2014-07-08 01:36:56 +02:00
libswscale swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding 2014-06-22 03:09:28 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests avcodec/roqvideo: use JPEG color range 2014-07-06 23:34:58 +02:00
tools tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h> 2014-07-08 01:56:33 +02:00
.gitignore Remove avserver. 2014-06-18 14:55:28 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog avformat: Add image3 demuxers with format autodetection 2014-07-03 18:14:06 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c cmdutils_opencl: Use av_malloc_array() 2014-07-01 03:49:36 +02:00
cmdutils.c cmdutils: ignore sws_flags if swscale is not enabled 2014-06-29 17:27:23 +02:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 2014-07-08 03:19:06 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
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 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: route -ab to -b:a 2014-06-29 02:47:49 +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: check av_opt_set_dict() return 2014-07-02 05:53:13 +02:00
ffmpeg.h ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffplay.c ffplay: decrease audio_diff_threshold 2014-06-24 21:59:21 +02:00
ffprobe.c ffprobe: add color_range and color_space to stream output 2014-06-24 00:35:16 +02:00
ffserver.c ffserver: add HAVE_UNISTD_H around #include <unistd.h> 2014-07-08 01:56:53 +02:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
Makefile Remove avserver. 2014-06-18 14:55:28 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +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

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.