FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-27 11:50:54 +00:00

Go to file

Michael Niedermayer 4f32efdff0 Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

* commit 'c3311d472a7528c67f76d0d061704ae70a99b32e':
  avienc: sanitize variable naming in write_header()

Conflicts:
	libavformat/avienc.c

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

2014-05-18 14:14:33 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

doc

Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

2014-05-18 13:00:50 +02:00

libavcodec

Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

2014-05-18 13:00:50 +02:00

libavdevice

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

2014-05-13 22:40:32 +02:00

libavfilter

avfilter/edgedetect: reuse already defined ctx.

2014-05-17 14:16:04 +02:00

libavformat

Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

2014-05-18 14:14:33 +02:00

libavresample

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

2014-05-13 22:40:32 +02:00

libavutil

lavu: add av_gettime_relative()

2014-05-17 15:28:03 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

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

libswresample

swresample: add swri_resample_float_avx

2014-05-16 05:27:03 +02:00

libswscale

swscale/utils: Add check that ensures that the hardcoded struct offsets are valid

2014-05-14 01:32:11 +02:00

presets

…

tests

Merge commit '4735784f1ced27026fbeada5fd31505132e565e9'

2014-05-16 21:22:25 +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 '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'

2014-05-15 18:20:17 +02:00

cmdutils_common_opts.h

…

cmdutils_opencl.c

…

cmdutils.c

cmdutils: omit deprecated codec ids in help output

2014-04-29 22:13:35 +02:00

cmdutils.h

cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32

2014-05-17 13:18:29 +02:00

common.mak

Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

2014-05-14 14:02:19 +02:00

configure

configure: make vp9 decoder select the parser.

2014-05-17 16:13:42 +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

Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

2014-05-05 15:51:55 +02:00

ffmpeg_opt.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

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

ffmpeg_vda.c

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

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

ffmpeg_vdpau.c

…

ffmpeg.c

ffmpeg: bitstream filters require split out side data

2014-05-15 22:41:12 +02:00

ffmpeg.h

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

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

ffplay.c

ffplay: Use av_gettime_relative()

2014-05-17 20:28:16 +02:00

ffprobe.c

ffprobe: use the codec descriptor if no decoder was found.

2014-04-29 13:25:59 +02:00

ffserver.c

ffserver: don't leak poll_table if poll fails

2014-05-10 18:16:19 -04:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

…

MAINTAINERS

MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file

2014-05-04 18:57:15 +02:00

Makefile

Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

2014-05-15 21:01:07 +02:00

README

…

RELEASE

Prepare for 11_alpha1 Release

2014-03-13 08:24:11 -04:00

version.sh

…

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) 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%