FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

Go to file

Michael Niedermayer 01a39a978c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
	Changelog
	libavformat/mvdec.c
	libavformat/version.h

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

2014-04-19 20:17:33 +02:00

compat

Merge remote-tracking branch 'qatar/master'

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

doc

Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

2014-04-19 19:26:46 +02:00

libavcodec

Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

2014-04-19 19:47:58 +02:00

libavdevice

Merge remote-tracking branch 'lukaszmluki/master'

2014-04-18 04:57:23 +02:00

libavfilter

Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

2014-04-19 18:30:37 +02:00

libavformat

Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

2014-04-19 20:17:33 +02:00

libavresample

Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

2014-04-17 21:07:25 +02:00

libavutil

x86/float_dsp: remove duplicated code from vector_dmul_scalar

2014-04-19 14:21:51 +02:00

libpostproc

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

2014-03-18 23:39:30 +01:00

libswresample

swresample/resample_template: try to consider src_size more exactly

2014-04-15 06:35:35 +02:00

libswscale

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

avformat/mlv: add fate sample

2014-04-19 05:06:06 +02:00

tools

tools/uncoded_frame: fix audio codec generation

2014-03-29 09:25:14 +01:00

.gitignore

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

2014-02-25 20:26:00 +01:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

Changelog

Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

2014-04-19 19:26:46 +02:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

cmdutils: use av_mallocz_array()

2014-04-08 15:44:32 +02:00

cmdutils.h

Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'

2014-03-29 14:33:39 +01:00

common.mak

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

configure

Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

2014-04-19 13:39:32 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

ffmpeg_opt.c

ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

2014-03-16 15:15:02 +01:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

ffmpeg: fix mixed merged & split side data with the stream->packet hack

2014-04-18 01:01:38 +02:00

ffmpeg.h

Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

2014-03-24 16:40:35 +01:00

ffplay.c

avformat: add av_format_inject_global_side_data(), and disable it by default

2014-04-15 02:37:40 +02:00

ffprobe.c

ffprobe: do not lose non ascii characters in non utf8 strings

2014-04-13 15:21:20 +02:00

ffserver.c

ffserver: don't hardcode RTSP status codes

2014-04-07 00:24:00 -03:00

INSTALL

…

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

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

LICENSE

Add libx265 encoder

2014-02-12 13:13:17 +00:00

MAINTAINERS

Add AVFoundation input device.

2014-04-11 17:51:33 +02:00

Makefile

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

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

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +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

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

Assembly 7.8%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%