FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00

Go to file

Michael Niedermayer 3db32ec119 Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd':
  APIChanges: add entry for av_read_packet deprecation
  mxfdec: fix typo in mxf_read_seek()
  avserver: use freopen to redirect stdin/out/err to /dev/null
  avserver: remove daemon mode
  configure: Check for -Werror parameters on clang
  doxygen: remove obsolete options from Doxyfile
  configure: Add option to disable all command line programs

Conflicts:
	Changelog
	configure
	doc/APIchanges
	doc/ffserver.conf
	doc/ffserver.texi
	ffserver.c

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

2012-11-16 13:07:10 +01:00

compat

…

doc

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

libavcodec

rv34: check image size before using it

2012-11-16 05:16:34 +01:00

libavdevice

Update iec61883 to handle multiple devices, and allow

2012-11-13 19:44:21 +01:00

libavfilter

lavfi/geq: fix GPL license header.

2012-11-15 21:48:39 +01:00

libavformat

mxfdec: fix typo in mxf_read_seek()

2012-11-15 17:37:09 +01:00

libavresample

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

libavutil

lavu/opt: fix av_opt_get_key_value() API.

2012-11-16 10:36:45 +01:00

libpostproc

pp: fix typo in avg() comment.

2012-11-15 21:54:18 +01:00

libswresample

swr/resample: fix SSSE3 included unconditionally.

2012-11-15 23:52:44 +01:00

libswscale

Merge remote-tracking branch 'qatar/master'

2012-11-14 12:34:30 +01:00

presets

…

tests

Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

2012-11-15 11:12:25 +01:00

tools

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

.gitignore

.gitignore: ignore *.3 files as well

2012-11-06 12:24:12 +01:00

arch.mak

…

Changelog

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

cmdutils_common_opts.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

cmdutils.c

lavu/opt: fix av_opt_get_key_value() API.

2012-11-16 10:36:45 +01:00

cmdutils.h

Revert "cmdutils: allow specifying the file for -report"

2012-11-04 10:47:52 +01:00

common.mak

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

configure

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

ffmpeg_opt.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

ffmpeg.c

ffmpeg: fix double ;;

2012-11-14 02:06:50 +01:00

ffmpeg.h

ffmpeg: use av_rescale_delta() on the audio filter input

2012-10-27 00:26:35 +02:00

ffplay.c

ffplay: adjust external clock speed based on buffer fullness for realtime sources

2012-11-04 18:29:49 +01:00

ffprobe.c

ffprobe: fix potential NULL pointer dereference

2012-11-06 22:59:24 +01:00

ffserver.c

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

INSTALL

…

library.mak

Merge remote-tracking branch 'qatar/master'

2012-11-03 14:48:51 +01:00

LICENSE

lavfi: add geq filter.

2012-11-11 23:12:54 +01:00

MAINTAINERS

MAINTAINERS: fix entry for img2

2012-11-06 01:46:21 +01:00

Makefile

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

README

…

RELEASE

…

version.sh

…

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 89.9%

Assembly 8.1%

Makefile 1.3%

C++ 0.3%

Objective-C 0.1%

Other 0.1%