FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-15 20:13:00 +00:00

Go to file

Michael Niedermayer e2f63be012 Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'

* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4':
  mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

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

2013-11-29 22:45:05 +01:00

compat

Merge remote-tracking branch 'qatar/master'

2013-11-24 23:27:32 +01:00

doc

doc/ffserver: specify missing argument for ACL feed option

2013-11-29 10:28:03 +01:00

libavcodec

Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'

2013-11-29 22:45:05 +01:00

libavdevice

lavd/pulse_audio_enc: add buffer size control options

2013-11-27 10:12:54 +01:00

libavfilter

Merge remote-tracking branch 'qatar/master'

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

libavformat

mxfdec: set extradata size

2013-11-29 14:19:47 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

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

libavutil

avutil/log: check that len is within the buffer before reading it

2013-11-27 17:06:42 +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

Add transcode_aac example to .gitignore.

2013-11-28 13:19:50 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

Merge remote-tracking branch 'qatar/master'

2013-11-26 13:13:45 +01:00

cmdutils_common_opts.h

cmdutils: Add -buildconf option.

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

cmdutils.c

Revert "configure: add #include "version.h" to config.h"

2013-11-28 00:19:45 +01:00

cmdutils.h

cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

2013-11-26 10:03:32 +01:00

common.mak

Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'

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

configure

configure: remove code that disables striping in the absence of some flags

2013-11-28 21:35:12 +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

ffmpeg: set VCFR when copying timestamps

2013-11-28 02:28:50 +01:00

ffmpeg.h

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

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

ffplay.c

ffplay: do not call avcodec_register_all() explicitly

2013-11-25 00:03:20 +01:00

ffprobe.c

Revert "configure: add #include "version.h" to config.h"

2013-11-28 00:19:45 +01:00

ffserver.c

ffserver: improve error feedback in case of write_header() failure

2013-11-29 12:11:39 +01:00

INSTALL

…

library.mak

library.mak: only run asm strip if ASMSTRIP flags are set

2013-11-28 21:52:46 +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 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'

2013-11-27 02:09:16 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update to 2.1.git

2013-11-29 16:41:42 +01: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%