ffmpeg

Go to file

Michael Niedermayer faba79e080 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

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

2011-07-30 06:46:08 +02:00

doc

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

ffpresets

Remove libx264 baseline ffpreset

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

libavcodec

Merge remote-tracking branch 'qatar/master'

2011-07-30 06:46:08 +02:00

libavdevice

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

libavfilter

vf_transpose: avoid multiple calls to avfilter_draw_slice()

2011-07-29 20:24:44 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2011-07-30 06:46:08 +02:00

libavutil

audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK

2011-07-28 10:04:09 +02:00

libpostproc

Merge remote-tracking branch 'qatar/master'

2011-07-06 23:57:11 +02:00

libswscale

lsws: apply logging factorization in sws_scale_init()

2011-07-28 10:27:51 +02:00

mt-work

Update todo

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

tests

lavfi-showfiltfmts: extend output format for specifying audio data

2011-07-28 10:04:09 +02:00

tools

lavfi-showfiltfmts: extend output format for specifying audio data

2011-07-28 10:04:09 +02:00

.gitignore

Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

2011-07-14 02:24:10 +02:00

Changelog

Merge remote-tracking branch 'qatar/master'

2011-07-23 16:47:10 +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-07-29 01:50:53 +02:00

cmdutils.h

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2011-07-21 16:28:53 +02:00

configure

Merge remote-tracking branch 'qatar/master'

2011-07-27 10:40:34 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

Doxyfile

Merge remote-tracking branch 'qatar/master'

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

ffmpeg.c

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

ffplay.c

Merge remote-tracking branch 'qatar/master'

2011-07-29 01:50:53 +02:00

ffprobe.c

Merge remote-tracking branch 'qatar/master'

2011-07-22 12:08:52 +02:00

ffserver.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

ffserver.h

…

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

Merge remote-tracking branch 'qatar/master'

2011-07-21 16:28:53 +02:00

README

cosmetics: fix dashed line length after 070c5d0

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

RELEASE

RELEASE: We are git after 0.8 release

2011-07-12 01:46:21 +02:00

subdir.mak

Merge remote-tracking branch 'qatar/master'

2011-07-12 01:42:32 +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.4%

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%