ffmpeg

Go to file

Michael Niedermayer 83f9bc8aee Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: prevent crash in av_open_input_file() if ap == NULL.
  more Changelog additions
  lavf: add a forgotten NULL check in convert_format_parameters().
  Fix build if yasm is not available.
  H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.

Conflicts:
	Changelog

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

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

doc

Fix -s documentation.

2011-06-18 09:36:07 +02:00

ffpresets

Merge remote-tracking branch 'qatar/master'

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

libavcodec

Merge remote-tracking branch 'qatar/master'

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

libavdevice

x11grab: remove a memory allocation and the associated memcpy.

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

libavfilter

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

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

libavutil

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +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

swscale: fix mono input for width%8

2011-06-19 03:54:16 +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-19 04:02:06 +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-18 05:10:38 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +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

ffmpeg: warn if samples need to be converted in a lossy way for lossless encoders.

2011-06-19 03:54:15 +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-18 05:10:38 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

ffserver.h

multiple inclusion guard cleanup

2011-05-21 13:48:10 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

LICENSE

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01: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

Revert "partially rename FFmpeg to Libav"

2011-03-17 17:26:45 +01: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.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%