FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00

Go to file

Michael Niedermayer ccdfa3e271 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

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

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

compat

Merge remote-tracking branch 'qatar/master'

2013-11-07 23:39:31 +01:00

doc

Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'

2013-11-24 04:55:35 +01:00

libavcodec

Merge remote-tracking branch 'qatar/master'

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

libavdevice

lavd/xv: free resources on errors

2013-11-15 09:56:58 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

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

libavformat

Merge remote-tracking branch 'qatar/master'

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

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

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

libpostproc

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

2013-06-16 18:21:39 +02:00

libswresample

lswr: fix assert failure on unknown layouts.

2013-11-03 10:30:37 +01:00

libswscale

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

2013-11-23 12:10:40 +01:00

presets

presets: specify the codecs.

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

tests

Merge commit '874838dc6589d978611c89a40694a5074f892a76'

2013-11-21 18:49:41 +01:00

tools

tools/probetest: also print the time the probe functions needed

2013-11-08 22:33:52 +01:00

.gitignore

doc/examples: rename demuxing to demuxing_decoding.

2013-11-04 12:53:06 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

cmdutils_common_opts.h

cmdutils: Add -buildconf option.

2013-11-19 22:09:48 +01:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

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

cmdutils.h

cmdutils: Add -buildconf option.

2013-11-19 22:09:48 +01:00

common.mak

Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'

2013-11-15 12:19:45 +01:00

configure

Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'

2013-11-24 04:55:35 +01: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

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

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

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffplay.c

Merge remote-tracking branch 'qatar/master'

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

ffprobe.c

ffprobe: use designated initializer for AVClass

2013-11-23 22:23:52 +00:00

ffserver.c

ffserver: strip odd chars from html error messages before sending them back

2013-10-09 00:30:46 +02:00

INSTALL

…

library.mak

build: remove pointless condition

2013-10-24 10:51:03 +01:00

LICENSE

libavfilter/vf_noise: relicense to LGPL

2013-10-27 20:29:07 +00:00

MAINTAINERS

MAINTAINERS: Add 1.2 back to the maintained releases

2013-11-12 14:33:54 +01:00

Makefile

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Update for 2.0

2013-07-10 02:15:43 +02: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.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%