FFmpeg

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

Go to file

Michael Niedermayer 2fd4901921 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
	libavcodec/libx264.c
	libavcodec/mpeg12.c

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

2011-09-06 21:35:18 +02:00

doc

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

ffpresets

Remove libx264 baseline ffpreset

2011-07-28 01:44:57 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-09-06 21:35:18 +02:00

libavdevice

dshow: properly disconnect and remove filters from graph

2011-09-06 21:14:51 +02:00

libavfilter

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-09-05 03:10:45 +02:00

libavutil

av_string: add av_asprintf().

2011-09-04 09:37:41 +02:00

libpostproc

postprocess.c: filter name needs to be double 0 terminated

2011-08-26 20:28:54 +02:00

libswscale

swscale: Fix unused asm and enable it

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

mt-work

Update todo

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

tests

Merge remote-tracking branch 'qatar/master'

2011-09-05 22:29:16 +02:00

tools

Merge remote-tracking branch 'qatar/master'

2011-08-26 23:18:54 +02:00

.gitignore

lavc: add a table of all codecs names.

2011-08-22 10:54:44 +02:00

avconv.c

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

Changelog

lavfi: add amovie source - audio movie source

2011-08-27 12:46:55 +02:00

cmdutils_common_opts.h

Make all option parsing functions match the function pointer type through which they are called.

2011-06-30 11:49:48 -04:00

cmdutils.c

Merge remote-tracking branch 'qatar/master'

2011-09-05 22:29:16 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-09-05 22:29:16 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

configure

ffmpeg: fix reading from stdin on windows

2011-09-04 02:14:39 +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 'qatar/master'

2011-07-14 20:44:58 +02:00

ffmpeg.c

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

ffplay.c

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-09-05 03:10:45 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-09-05 03:10:45 +02: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

MAINTAINERS: add a "Releases" section

2011-06-24 11:15:26 +02:00

Makefile

Makefile: remove unused PROGS_G.

2011-09-01 20:23:40 +02:00

README

cosmetics: fix dashed line length after 070c5d0

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

RELEASE

set Release to 0.8.2.git. We are at 0.8.2 and a bit further.

2011-08-13 03:39:58 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-31 00:34:47 +02: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.

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%