FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Go to file

Michael Niedermayer 6c38884876 Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c

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

2013-02-06 13:27:24 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

doc

doc/filters: apply various rendering changes to the showspectrum docs

2013-02-05 00:12:55 +01:00

libavcodec

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

libavdevice

lavd/alsa: simplify reordering functions definition.

2013-02-02 14:13:11 +01:00

libavfilter

libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream

2013-02-05 15:54:39 +01:00

libavformat

lavf/segment: extend PTS debugging log with -reset_timestamps

2013-02-06 00:40:09 +01:00

libavresample

Merge remote-tracking branch 'qatar/master'

2013-01-18 13:54:38 +01:00

libavutil

lavu/parseutils: add digital cinema frame sizes

2013-02-03 22:57:04 +01:00

libpostproc

build: postproc cleanup.

2012-12-30 02:27:52 +01:00

libswresample

swr: Dont use floats for S32->S32 when possible

2013-02-04 04:11:46 +01:00

libswscale

sws: Fix "warning: comparison of distinct pointer types lacks a cast"

2013-02-04 14:34:13 +01:00

presets

presets: specify the codecs.

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

tests

sws: add planar RGB formats to isAnyRGB

2013-01-26 20:40:44 +01:00

tools

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

.gitignore

.gitignore: add /doc/examples/pc-uninstalled

2013-01-17 17:59:18 +00:00

arch.mak

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

2012-12-08 14:24:16 +01:00

Changelog

lavfi/showspectrum: display multiple channels in separate row

2013-02-04 13:37:43 +00:00

cmdutils_common_opts.h

cmdutils: implement debug/fdebug log level update differently.

2012-12-20 02:38:18 +01:00

cmdutils.c

cmdline: fix -- to escape files starting with -

2013-01-19 14:50:36 +01:00

cmdutils.h

lavf: remove nonexistent symbols

2013-01-11 10:07:52 +00:00

common.mak

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

configure

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01: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

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_filter.c

ffmpeg: support filtering of unknown channel layouts.

2013-01-26 11:15:38 +01:00

ffmpeg_opt.c

ffmpeg: dont allow -flags to override -pass

2013-02-06 01:26:26 +01:00

ffmpeg.c

ffmpeg: do not call exit from exit_program()

2013-02-06 04:03:52 +01:00

ffmpeg.h

ffmpeg: implement -force_key_frames expression evalution

2013-01-27 16:56:47 +01:00

ffplay.c

ffplay: report video frame changes only in debug mode

2013-02-06 00:20:37 +01:00

ffprobe.c

ffprobe: do not escape '"' between single quotes.

2013-01-01 13:32:51 +01:00

ffserver.c

ffserver: add missing padding to extradata.

2012-12-30 22:22:18 +01:00

INSTALL

Merge remote branch 'qatar/master'

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

library.mak

build: Remove superfluous MAKE variable for the build suffix

2013-02-03 13:08:36 +01:00

LICENSE

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

MAINTAINERS

MAINTAINERS: add 1.1, remove 0.10

2013-01-06 21:42:35 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-12-11 08:24:45 +01:00

README

README: be a tiny bit more verbose

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

RELEASE

RELEASE: 1.1.git for master

2013-01-06 21:42:35 +01: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%