virtualenv/FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00

Go to file

Michael Niedermayer 3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367'

* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

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

2014-07-17 23:27:40 +02:00

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

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

lavd/x11grab: add an option to disable MIT-SHM.

2014-07-17 18:12:15 +02:00

Merge commit '2d60444331fca1910510038dd3817bea885c2367'

2014-07-17 23:27:40 +02:00

lavd/x11grab: reindent after last commit.

2014-07-17 18:28:58 +02:00

Merge commit '2d60444331fca1910510038dd3817bea885c2367'

2014-07-17 23:27:40 +02:00

lavf/segment: set segment end time when the first packet arrives

2014-07-17 16:51:51 +02:00

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

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

lavu/eval: add clip function

2014-07-17 11:29:01 +02:00

Fix libpostproc compilation with !HAVE_6REGS.

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

fix spelling errors

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

swscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420

2014-07-13 05:48:09 +02:00

presets: remove moldering iPod presets

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

lavu/eval: add clip function

2014-07-17 11:29:01 +02:00

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 '2d60444331fca1910510038dd3817bea885c2367'

2014-07-17 23:27:40 +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

…

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 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE.md

LICENCE: add markdown syntax

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

MAINTAINERS

Adding Maintainer for dvbsubdec

2014-07-15 00:46:30 +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

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 90.3%

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%