FFmpeg

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

Go to file

Michael Niedermayer 7ed9ec033f Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: Drop unused functions spatial_compose{53|97}i()
  nutdec: Remove unused and broken debug function stub
  avcodec: Drop long-deprecated imgconvert.h header
  Add Opus support to the Ogg muxer.
  Add Opus codec id and codec description.
  avformat: Identify anonymous AVIO typedef structs.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/imgconvert.h
	libavcodec/version.h
	libavformat/oggenc.c
	libavformat/version.h

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

2012-09-28 05:11:19 +02:00

compat

MinGW: Use our snprintf/vsnprintf when MinGW's is broken

2012-09-25 18:14:14 -04:00

doc

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

libavcodec

Merge remote-tracking branch 'qatar/master'

2012-09-28 05:11:19 +02:00

libavdevice

lavd/lavfi: push frames until the last sink is EOF

2012-09-20 12:13:17 +02:00

libavfilter

lavfi/sink_buffer: implement libav compatibility API.

2012-09-27 18:43:37 +02:00

libavformat

Merge remote-tracking branch 'qatar/master'

2012-09-28 05:11:19 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-09-14 14:13:38 +02:00

libavutil

MinGW: Use our snprintf/vsnprintf when MinGW's is broken

2012-09-25 18:14:14 -04:00

libpostproc

postproc: Fix unprotected inline asm

2012-09-11 20:12:14 +02:00

libswresample

ARM: libswresample: NEON optimised generic fltp to s16 conversion

2012-09-24 23:19:32 +02:00

libswscale

swscale: change assert() to av_assert()

2012-09-18 05:19:11 +02:00

presets

presets: specify the codecs.

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

tests

tests/Makefile: fix ffprobe test dependancy

2012-09-28 02:58:35 +02:00

tools

Fix two "skiping" typo.

2012-09-25 07:42:32 +02:00

.gitignore

gitignore: codec_names.h is no more

2012-09-07 14:59:01 +02:00

arch.mak

Optimization of AMR NB and WB decoders for MIPS

2012-06-11 21:12:39 +02:00

Changelog

Changelog, split next from 1.0

2012-09-27 20:25:53 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

2012-08-28 15:09:49 +02:00

cmdutils.c

cmdutils: sort codec lists.

2012-09-23 21:05:29 +02:00

cmdutils.h

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

configure

configure: Fix 10l in 5ae9fa13f5ac640bec113120d540f70971aa635d

2012-09-25 18:21:53 -04: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

Revert "partially rename FFmpeg to Libav"

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

Doxyfile

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

ffmpeg_filter.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +02:00

ffmpeg_opt.c

ffmpeg: add option to control copying of frames prior to start.

2012-09-27 03:52:31 +02:00

ffmpeg.c

ffmpeg: add option to control copying of frames prior to start.

2012-09-27 03:52:31 +02:00

ffmpeg.h

ffmpeg: add option to control copying of frames prior to start.

2012-09-27 03:52:31 +02:00

ffplay.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

ffprobe.c

ffprobe: fix indentation of the first line of packets_and_frames sections in the json output

2012-09-27 01:10:46 +02:00

ffserver.c

ffserver: fix typo in log message

2012-09-18 21:11:06 -05:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'

2012-09-20 03:20:29 +02:00

LICENSE

LICENSE: correct incorrect claims on *GPL incompatibility

2012-08-16 04:47:18 +02:00

MAINTAINERS

MAINTAINERS: add 1.0

2012-09-27 01:48:14 +02:00

Makefile

Makefile: remove old codec_names.h on distclean

2012-09-07 14:59:01 +02:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: update for 1.0

2012-09-27 01:48:14 +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 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%