mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-21 23:12:36 +00:00

Go to file

Michael Niedermayer 7cdb3b2b79 Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-07-22 12:46:13 +02:00

compat

compat/w32pthreads: add return value to pthread_cond_init().

2014-05-26 11:33:42 +02:00

doc

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

libavcodec

Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

2014-07-22 12:46:13 +02:00

libavdevice

Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

2014-07-19 13:39:12 +02:00

libavfilter

avfilter/biquads: avoid clipping when using floating type

2014-07-21 03:48:18 +02:00

libavformat

libavformat/img2dec.c: Add a long_name to the piped image demuxers

2014-07-22 05:14:44 +02:00

libavresample

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

2014-05-29 01:23:22 +02:00

libavutil

Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

2014-07-22 12:46:13 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

2014-04-24 17:50:02 +02:00

libswresample

fix spelling errors

2014-07-12 22:33:27 +02:00

libswscale

swscale/utils: fix rgb -> fullrange yuv

2014-07-19 23:24:26 +02:00

presets

presets: remove moldering iPod presets

2014-06-17 16:15:04 -08:00

tests

Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'

2014-07-21 23:08:41 +02:00

tools

tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

2014-07-08 01:56:33 +02:00

.gitignore

gitignore: add examples/transcoding

2014-07-10 02:18:09 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

Changelog: change "version <next>" to "version 2.3"

2014-07-16 02:09: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 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

2014-07-22 03:06:43 +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

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: remove intra_dc_precision, its handled by AVOptions

2014-07-15 20:18:19 +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: Fix copying timebase to muxer context

2014-07-15 15:51:31 +02:00

ffmpeg.h

ffmpeg: support setting AVStream.discard

2014-06-07 21:26:22 +02:00

ffplay.c

ffplay: increase subtitle que size

2014-07-12 16:29:03 +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: use av_mallocz_array()

2014-07-17 18:00:25 +02:00

INSTALL.md

INSTALL: add markdown syntax

2014-05-28 22:38:38 +02:00

library.mak

Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

2014-07-22 02:45:45 +02:00

LICENSE.md

LICENCE: add markdown syntax

2014-05-28 22:38:28 +02:00

MAINTAINERS

MAINTAINERS: Add db0 for the website

2014-07-20 17:01:59 +02:00

Makefile

Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

2014-07-22 03:06:43 +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

RELEASE_NOTES

avfilter/drawtext: Add basic text shaping using libfribidi

2014-07-16 00:40:39 +02:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01:00

README.md

FFmpeg README

Documentation

Read the documentation in the doc/ directory in git.

You can also view it online at http://ffmpeg.org/documentation.html

Licensing

See the LICENSE file.

Build and Install

See the INSTALL file.

Languages

C 89%

Assembly 8.4%

Makefile 1.4%

GLSL 0.4%

C++ 0.3%

Other 0.2%