FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00

Go to file

Michael Niedermayer 17ebef2fc8 Merge commit '2c328a907978b61949fd20f7c991803174337855'

* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
	doc/APIchanges
	doc/ffplay.texi
	ffplay.c
	libavutil/version.h

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

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

compat

compat/strtod: isspace -> av_isspace.

2013-03-04 03:37:36 +01:00

doc

Merge commit '2c328a907978b61949fd20f7c991803174337855'

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

libavcodec

vc1dec: interlaced B-frames

2013-03-20 03:37:48 +01:00

libavdevice

lavd/dshow: fix style and typo recently introduced.

2013-03-19 21:26:24 +01:00

libavfilter

lavfi: remove harddup libmpcodecs wrapper

2013-03-19 17:15:53 +00:00

libavformat

Merge commit '2c328a907978b61949fd20f7c991803174337855'

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

libavresample

Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

2013-02-24 17:45:06 +01:00

libavutil

Merge commit '2c328a907978b61949fd20f7c991803174337855'

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

libpostproc

Fix libpostproc compilation on x86_32 with disable-optimizations.

2013-02-09 15:03:04 +01:00

libswresample

buildsys: only include log2_tab per library for shared builds

2013-03-04 12:25:02 +01:00

libswscale

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

presets

presets: specify the codecs.

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

tests

fate: make metadata fate tests only output ts and metadata.

2013-03-20 00:09:44 +01:00

tools

Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

2013-03-16 16:09:37 +01:00

.gitignore

tools: add seek_print.

2013-02-24 13:12:46 +01:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

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

Changelog

changelog: 10% faster aac encoding on x86 and MIPS

2013-03-19 13:23:05 -04:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

opt: re-enable memleak fix for duplicated options.

2013-03-13 07:25:16 +01:00

cmdutils.h

Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

2013-03-12 18:10:35 +01:00

common.mak

Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

2013-02-24 15:24:38 +01:00

configure

lavc: make compilation of frame_thread_encoder.o optional.

2013-03-14 15:04:17 +01:00

COPYING.GPLv2

Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.

2009-06-05 09:51:31 +00:00

COPYING.GPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

Add configure option to upgrade (L)GPL to version 3.

2009-06-05 11:04:03 +00:00

CREDITS

CREDITS: redirect to Git log, remove current outdated content

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

ffmpeg_filter.c

Remove references to the "ff" variant of buffersink.

2013-03-12 23:31:07 +01:00

ffmpeg_opt.c

ffmpeg: make -lavfi an alias for -filter_complex.

2013-03-17 16:24:43 +01:00

ffmpeg.c

Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.

2013-03-19 01:16:37 +01:00

ffmpeg.h

Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

2013-03-12 14:16:02 +01:00

ffplay.c

ffplay: silence warning of mixed enumeration types

2013-03-19 09:39:28 +00:00

ffprobe.c

ffprobe: set writer context to 0 after allocation

2013-03-19 18:00:34 +01:00

ffserver.c

opt: re-enable memleak fix for duplicated options.

2013-03-13 07:25:16 +01:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

build: fixes a "can't cd to..." issue when installing shared libraries.

2013-02-15 08:39:35 +01:00

LICENSE

lavfi: port MP stereo3d filter

2013-03-05 18:36:40 +00:00

MAINTAINERS

MAINTAINERS: mention that people are welcome to pick up and maintain older releases

2013-03-14 14:50:42 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01:00

version.sh

version.sh: handle shallow clones and snapshots.

2011-07-22 10:43:59 +02: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.1%

Other 0.1%