FFmpeg

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

Go to file

Michael Niedermayer a9bd51b1e6 Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
  mpegvideo: fix indentation
  sws: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavcodec/mpegvideo.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

2012-10-12 15:57:28 +02:00

compat

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

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

doc

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

libavcodec

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

libavdevice

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

libavfilter

lavfi/ebur128: fix typo in condition.

2012-10-11 18:41:07 +02:00

libavformat

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

libavresample

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

libavutil

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

libpostproc

postproc: Create version.h header

2012-09-28 15:06:26 +02:00

libswresample

swri_resample_init: unsupported sample formats are an internal error.

2012-10-11 04:36:23 +02:00

libswscale

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

2012-10-12 15:57:28 +02:00

presets

presets: specify the codecs.

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

tests

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

2012-10-11 15:46:48 +02:00

tools

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +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

prepare 9_beta1 release

2012-10-11 18:36:40 +02:00

cmdutils_common_opts.h

cmdutils: add -layouts option.

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

cmdutils.c

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

cmdutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

common.mak

Merge remote-tracking branch 'qatar/master'

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

configure

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

COPYING.GPLv2

…

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 '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ffmpeg_opt.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

2012-10-11 15:46:48 +02:00

ffmpeg.c

Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

2012-10-10 13:51:07 +02:00

ffmpeg.h

Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

2012-10-10 13:51:07 +02:00

ffplay.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ffprobe.c

ffprobe: fix use of uninitialized pointer in av_strtok()

2012-10-11 03:37:43 +02:00

ffserver.c

ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.

2012-10-02 22:59:03 +02:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +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

prepare 9_beta1 release

2012-10-11 18:36:40 +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.2%

Other 0.1%