FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

Go to file

Michael Niedermayer 4f643430f2 Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

* commit '9446d75941d639f19cfa9ae007eb4c5ca041f200':
  ffmpeg: merge output_codecs array into AVOutputStream members.
  rtpenc_latm: Consistently use "Libav" in license boilerplate.
  rtsp: Don't pass string pointer as format string to ff_url_join
  mmsh: fixed printf injection bug in mmsh request
  codec-regression: remove pointless -r options for dnxhd

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

2011-06-17 05:49:58 +02:00

doc

Fix documentation for -ar and -ac.

2011-06-16 23:18:50 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00

libavcodec

Fix compilation with old yasm.

2011-06-16 23:18:50 +02:00

libavdevice

x11grab: remove a memory allocation and the associated memcpy.

2011-06-12 12:18:05 +02:00

libavfilter

vf_mp: Fix large memleak.

2011-06-15 01:36:12 +02:00

libavformat

Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

2011-06-17 05:49:58 +02:00

libavutil

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

libpostproc

postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0)

2011-06-02 14:43:14 +02:00

libswscale

Merge remote-tracking branch 'qatar/master'

2011-06-16 03:53:58 +02:00

mt-work

Update todo

2011-06-12 18:01:29 +02:00

tests

Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

2011-06-17 05:49:58 +02:00

tools

showfiltfmts: use av_get_pix_fmt_name()

2011-06-07 12:44:51 +02:00

.gitignore

Merge remote-tracking branch 'qatar/master'

2011-05-20 05:48:22 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-06-14 04:56:26 +02:00

cmdutils_common_opts.h

cmdutils: remove OPT_FUNC2

2011-05-28 18:23:05 +02:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2011-06-13 04:39:58 +02:00

cmdutils.h

cmdutils: remove unnecessary OPT_DUMMY implementation

2011-06-05 13:21:06 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-06-15 02:15:25 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2011-06-08 05:25:28 +02: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

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

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

COPYING.LGPLv3

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

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

CREDITS

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01:00

Doxyfile

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

ffmpeg.c

Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

2011-06-17 05:49:58 +02:00

ffplay.c

Do not crash if SDL_SetVideoMode() fails.

2011-06-16 23:21:19 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

ffserver.h

Add FFMPEG_ prefix to all multiple inclusion guards.

2007-10-17 09:37:46 +00:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

MAINTAINERS

add MicroDVD muxer and demuxer

2011-04-04 01:29:40 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-06-15 02:15:25 +02:00

README

cosmetics: fix dashed line length after 070c5d0

2011-03-28 09:53:40 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +02:00

version.sh

Merge remote-tracking branch 'newdev/master'

2011-03-19 20:05:11 +01:00

README

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.

Languages

C 90.1%

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%