ffmpeg

Go to file

Michael Niedermayer e13d5e9a4b Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

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

2012-11-14 11:59:20 +01:00

compat

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

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

doc

Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

2012-11-14 11:59:20 +01:00

libavcodec

Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

2012-11-14 11:59:20 +01:00

libavdevice

Update iec61883 to handle multiple devices, and allow

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

libavfilter

lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths

2012-11-13 22:54:29 +01:00

libavformat

Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

2012-11-14 11:59:20 +01:00

libavresample

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

libavutil

Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

2012-11-14 11:59:20 +01:00

libpostproc

pp: avoid overflow in w*h

2012-10-13 21:17:43 +02:00

libswresample

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

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

libswscale

Merge remote-tracking branch 'qatar/master'

2012-11-10 12:44:39 +01:00

presets

presets: specify the codecs.

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

tests

remove tests/asynth1.sw

2012-11-13 10:36: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

Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

2012-10-13 15:25:11 +02:00

Changelog

lavfi: add geq filter.

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

cmdutils_common_opts.h

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

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

cmdutils.c

pixdesc: add av_pix_fmt_get_chroma_sub_sample

2012-11-13 16:14:55 +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 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

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

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

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

ffserver: fix NULL dereference with quoted Stream name.

2012-11-14 10:09:57 +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

README: be a tiny bit more verbose

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

RELEASE

Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'

2012-10-24 14:01:36 +02:00

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

Assembly 7.7%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%