mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Go to file

Michael Niedermayer aff0912da5 Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'

* commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd':
  mpegts: Provide an option to override the pcr period

Conflicts:
	doc/muxers.texi
	libavformat/mpegtsenc.c

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

2014-06-10 23:55:57 +02:00

compat

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

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

doc

Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'

2014-06-10 23:55:57 +02:00

libavcodec

Fix standalone compilation of the webvtt encoder.

2014-06-10 23:47:04 +02:00

libavdevice

avdevice/lavfi: Use av_malloc_array()

2014-06-07 15:04:50 +02:00

libavfilter

avfilter/vf_zoompan: fix mixing of declarations and statements

2014-06-09 17:27:34 +02:00

libavformat

Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'

2014-06-10 23:55:57 +02:00

libavresample

Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'

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

libavutil

Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'

2014-06-09 17:25:09 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

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

libswresample

swr: handle 64bit overflow check in multiple_resample().

2014-06-09 15:24:51 +02:00

libswscale

x86/scale: fix xmm register count for hscale*_sse2

2014-06-09 04:13:23 +02:00

presets

…

tests

tests: add a third, 34x34, target

2014-06-10 20:24:49 +02:00

tools

tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB

2014-06-10 04:00:06 +02:00

.gitignore

gitignore: add tools/uncoded_frame

2014-05-06 14:14:32 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

Zoom & Pan filter

2014-06-09 12:41:33 +00: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

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

common.mak

Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

2014-05-20 03:33:30 +02:00

configure

Merge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2'

2014-06-09 16:48:08 +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: support setting AVStream.discard

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

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

2014-05-12 02:44:28 +02:00

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: prevent pts < dts to be passed through to the muxer on stream copy

2014-06-05 18:37:32 +02:00

ffmpeg.h

ffmpeg: support setting AVStream.discard

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

ffplay.c

ffplay: support rotated video.

2014-05-23 23:30:21 +02:00

ffprobe.c

ffprobe: add rc_max_rate to stream output

2014-06-09 23:19:33 +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 '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: new multimedia filter avf_showcqt.c

2014-06-05 14:04:01 +02:00

Makefile

Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

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

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.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%