FFmpeg

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

Go to file

Michael Niedermayer 800ea20cad Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Make tkhd "enabled" flag QuickTime compatible

Conflicts:
	libavformat/movenc.c
	tests/ref/acodec/alac
	tests/ref/acodec/pcm-s16be
	tests/ref/acodec/pcm-s24be
	tests/ref/acodec/pcm-s32be
	tests/ref/acodec/pcm-s8
	tests/ref/lavf/mov
	tests/ref/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth1-prores
	tests/ref/vsynth/vsynth1-qtrle
	tests/ref/vsynth/vsynth1-svq1
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-svq1

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

2013-08-23 13:49:24 +02:00

compat

Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'

2013-08-22 13:09:24 +02:00

doc

lavfi/hue: allow changing brightness

2013-08-22 14:56:13 +00:00

libavcodec

pngdec: use av_fast_padded_malloc(z)

2013-08-23 10:29:33 +00:00

libavdevice

lavd: Fix make checkheaders

2013-08-11 00:40:30 +02:00

libavfilter

lavfi/tile: do not leak input frame

2013-08-23 10:28:29 +00:00

libavformat

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

libavresample

…

libavutil

libavutil/opt.h: Fix duplicate words

2013-08-12 19:40:29 +02:00

libpostproc

…

libswresample

swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output

2013-08-20 16:56:51 +02:00

libswscale

swscale: improve dither checks

2013-08-19 18:33:50 +02:00

presets

…

tests

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

tools

…

.gitignore

…

arch.mak

…

Changelog

avcodec/mjpegdec: Read EXIF metadata in JPEG input.

2013-08-13 00:30:34 +02:00

cmdutils_common_opts.h

…

cmdutils.c

Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

2013-08-08 11:54:14 +02:00

cmdutils.h

…

common.mak

…

configure

configure: Add exif to CONFIG_EXTRA.

2013-08-21 19:00:48 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

…

COPYING.LGPLv3

…

CREDITS

…

ffmpeg_filter.c

ffmpeg_filter: check that the input media type match the filter

2013-08-14 03:03:41 +02:00

ffmpeg_opt.c

…

ffmpeg.c

Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding.

2013-08-18 22:00:35 +02:00

ffmpeg.h

…

ffplay.c

ffplay: check for filter EOF return codes

2013-08-09 00:16:13 +02:00

ffprobe.c

…

ffserver.c

ffserver: allocate rc_eq, prevent freeing invalid pointer

2013-08-13 15:24:30 +02:00

INSTALL

…

library.mak

…

LICENSE

…

MAINTAINERS

MAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for new fixed point FFT

2013-08-13 11:57:26 +02:00

Makefile

…

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

Assembly 7.9%

Makefile 1.3%

C++ 0.2%

Objective-C 0.2%

Other 0.1%